From a045ddc1996618ce3dd2f7d6cb7f5f0f25575cca Mon Sep 17 00:00:00 2001 From: Maxim Patlasov Date: Wed, 20 Mar 2024 20:46:53 -0700 Subject: [PATCH] UPSTREAM: : Add OpenShift files And remove .github --- .ci-operator.yaml | 4 +++ .github/ISSUE_TEMPLATE/bug_report.md | 25 ----------------- .github/ISSUE_TEMPLATE/enhancement.md | 18 ------------ .github/ISSUE_TEMPLATE/support.md | 16 ----------- .github/PULL_REQUEST_TEMPLATE.md | 40 --------------------------- .github/dependabot.yaml | 40 --------------------------- .github/workflows/codespell.yml | 15 ---------- .snyk | 7 +++++ Dockerfile.openshift | 8 ++++++ Dockerfile.openshift.rhel7 | 8 ++++++ OWNERS | 10 ++----- OWNERS_ALIASES | 10 ++++++- 12 files changed, 38 insertions(+), 163 deletions(-) create mode 100644 .ci-operator.yaml delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 .github/ISSUE_TEMPLATE/enhancement.md delete mode 100644 .github/ISSUE_TEMPLATE/support.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 .github/dependabot.yaml delete mode 100644 .github/workflows/codespell.yml create mode 100644 .snyk create mode 100644 Dockerfile.openshift create mode 100644 Dockerfile.openshift.rhel7 mode change 120000 => 100644 OWNERS_ALIASES diff --git a/.ci-operator.yaml b/.ci-operator.yaml new file mode 100644 index 0000000000..64887a08b4 --- /dev/null +++ b/.ci-operator.yaml @@ -0,0 +1,4 @@ +build_root_image: + name: release + namespace: openshift + tag: rhel-9-release-golang-1.22-openshift-4.18 diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index ad0d03f9f9..0000000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Bug Report -about: Create a report to help us improve this project - ---- - - - - -**What happened**: - -**What you expected to happen**: - -**How to reproduce it**: - -**Anything else we need to know?**: - -**Environment**: -- Driver version: -- Kubernetes version (use `kubectl version`): -- OS (e.g. from /etc/os-release): -- Kernel (e.g. `uname -a`): -- Install tools: -- Others: diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md deleted file mode 100644 index a9d33a2af0..0000000000 --- a/.github/ISSUE_TEMPLATE/enhancement.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -name: Enhancement Request -about: Suggest an idea for this project - ---- - - -**Is your feature request related to a problem?/Why is this needed** - - -**Describe the solution you'd like in detail** - - -**Describe alternatives you've considered** - - -**Additional context** - diff --git a/.github/ISSUE_TEMPLATE/support.md b/.github/ISSUE_TEMPLATE/support.md deleted file mode 100644 index 6d3b436fb1..0000000000 --- a/.github/ISSUE_TEMPLATE/support.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -name: Support Request -about: Ask questions about this project - ---- - - - diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index d70526403f..0000000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1,40 +0,0 @@ - - -**What type of PR is this?** -> Uncomment only one ` /kind <>` line, hit enter to put that in a new line, and remove leading whitespaces from that line: -> -> /kind api-change -> /kind bug -> /kind cleanup -> /kind design -> /kind documentation -> /kind failing-test -> /kind feature -> /kind flake - -**What this PR does / why we need it**: - -**Which issue(s) this PR fixes**: - -Fixes # - -**Special notes for your reviewer**: - -**Does this PR introduce a user-facing change?**: - -```release-note - -``` diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml deleted file mode 100644 index 064cb4270b..0000000000 --- a/.github/dependabot.yaml +++ /dev/null @@ -1,40 +0,0 @@ -version: 2 -enable-beta-ecosystems: true -updates: -- package-ecosystem: gomod - directory: "/" - allow: - - dependency-type: "all" - schedule: - interval: weekly - groups: - golang-dependencies: - patterns: - - "github.com/golang*" - k8s-dependencies: - patterns: - - "k8s.io*" - - "sigs.k8s.io*" - - "github.com/kubernetes-csi*" - github-dependencies: - patterns: - - "*" - exclude-patterns: - - "github.com/golang*" - - "k8s.io*" - - "sigs.k8s.io*" - - "github.com/kubernetes-csi*" - labels: - - "area/dependency" - - "release-note-none" - - "ok-to-test" - open-pull-requests-limit: 10 -- package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - labels: - - "area/dependency" - - "release-note-none" - - "ok-to-test" - open-pull-requests-limit: 10 diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml deleted file mode 100644 index 8548c33ea5..0000000000 --- a/.github/workflows/codespell.yml +++ /dev/null @@ -1,15 +0,0 @@ -# GitHub Action to automate the identification of common misspellings in text files. -# https://github.com/codespell-project/actions-codespell -# https://github.com/codespell-project/codespell -name: codespell -on: [push, pull_request] -jobs: - codespell: - name: Check for spelling errors - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4.1.7 - - uses: codespell-project/actions-codespell@master - with: - check_filenames: true - skip: ./.git,./.github/workflows/codespell.yml,.git,*.png,*.jpg,*.svg,*.sum,./vendor,go.sum,./release-tools/prow.sh diff --git a/.snyk b/.snyk new file mode 100644 index 0000000000..186efac005 --- /dev/null +++ b/.snyk @@ -0,0 +1,7 @@ +# References: +# https://docs.snyk.io/scan-applications/snyk-code/using-snyk-code-from-the-cli/excluding-directories-and-files-from-the-snyk-code-cli-test +# https://docs.snyk.io/snyk-cli/commands/ignore +exclude: + global: + - vendor/** + - release-tools/** diff --git a/Dockerfile.openshift b/Dockerfile.openshift new file mode 100644 index 0000000000..6f250325b8 --- /dev/null +++ b/Dockerfile.openshift @@ -0,0 +1,8 @@ +FROM registry.svc.ci.openshift.org/openshift/release:golang-1.15 AS builder +WORKDIR /go/src/github.com/kubernetes-csi/external-provisioner +COPY . . +RUN make build + +FROM registry.svc.ci.openshift.org/openshift/origin-v4.7:base +COPY --from=builder /go/src/github.com/kubernetes-csi/external-provisioner/bin/csi-provisioner /usr/bin/ +ENTRYPOINT ["/usr/bin/csi-provisioner"] diff --git a/Dockerfile.openshift.rhel7 b/Dockerfile.openshift.rhel7 new file mode 100644 index 0000000000..f0e316c691 --- /dev/null +++ b/Dockerfile.openshift.rhel7 @@ -0,0 +1,8 @@ +FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder +WORKDIR /go/src/github.com/kubernetes-csi/external-provisioner +COPY . . +RUN make build + +FROM registry.ci.openshift.org/ocp/4.18:base-rhel9 +COPY --from=builder /go/src/github.com/kubernetes-csi/external-provisioner/bin/csi-provisioner /usr/bin/ +ENTRYPOINT ["/usr/bin/csi-provisioner"] diff --git a/OWNERS b/OWNERS index ca2de348c1..a3edb31917 100644 --- a/OWNERS +++ b/OWNERS @@ -1,11 +1,5 @@ # See the OWNERS docs at https://go.k8s.io/owners approvers: -- kubernetes-csi-approvers -- pohly - -reviewers: -- kubernetes-csi-reviewers - -# emeritus_reviewers: -# - davidz627 +- openshift-storage-maintainers +component: "Storage / Kubernetes External Components" diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES deleted file mode 120000 index 3f60d46159..0000000000 --- a/OWNERS_ALIASES +++ /dev/null @@ -1 +0,0 @@ -release-tools/KUBERNETES_CSI_OWNERS_ALIASES \ No newline at end of file diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES new file mode 100644 index 0000000000..c448025044 --- /dev/null +++ b/OWNERS_ALIASES @@ -0,0 +1,9 @@ +aliases: + openshift-storage-maintainers: + - jsafrane + - tsmetana + - gnufied + - bertinatto + - dobsonj + - RomanBednar + - mpatlasov