Merge branch 'k8s-operatorhub:main' into main

dineshsuryaprakash · Nov 20, 2023 · 89c2df5 · 89c2df5
2 parents f28765c + 5a0b49d
commit 89c2df5
Show file tree

Hide file tree

Showing 4,246 changed files with 2,048,201 additions and 425,269 deletions.
diff --git a/.github/workflows/dco_test.yaml b/.github/workflows/dco_test.yaml
@@ -20,7 +20,7 @@ env:
   OPP_THIS_BRANCH: "main"
   OPP_PROD: 0
   OPP_DRY_RUN: 0
-  KIND_KUBE_VERSION: "v1.26.3"
+  KIND_KUBE_VERSION: "v1.27.2"
   OPP_PRODUCTION_TYPE: "k8s"
   OPP_REVIEWERS_ENABLED: 1
 

diff --git a/.github/workflows/dco_workflow_complete.yaml b/.github/workflows/dco_workflow_complete.yaml
@@ -38,7 +38,8 @@ jobs:
       - name: 'PR Number'
         id: pr-number
         run: |
-          PR=$(cat ./NR)
+          PR=$(tr -dc [0-9] <./NR)
+          [ -z "$PR" ] && echo "Invalid PR number" && exit 1
           echo "pr=${PR}" >> $GITHUB_OUTPUT
 
       - uses: actions/github-script@v6
@@ -65,11 +66,13 @@ jobs:
         if: needs.pr.outputs.pr != '0'
         uses: actions/github-script@v6
         continue-on-error: true
+        env:
+          PR: "${{ needs.pr.outputs.pr }}"
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
             github.rest.issues.removeLabel({
-              issue_number: ${{ needs.pr.outputs.pr }},
+              issue_number: process.env.PR,
               owner: context.repo.owner,
               repo: context.repo.repo,
               name: 'dco-failed'

diff --git a/.github/workflows/operator_ci_approved.yaml b/.github/workflows/operator_ci_approved.yaml
@@ -22,7 +22,7 @@ env:
   OPP_THIS_BRANCH: "main"
   OPP_PROD: 0
   OPP_DRY_RUN: 0
-  KIND_KUBE_VERSION: "v1.26.3"
+  KIND_KUBE_VERSION: "v1.27.2"
   OPP_PRODUCTION_TYPE: "k8s"
   OPP_REVIEWERS_ENABLED: 1
 

diff --git a/.github/workflows/operator_release.yaml b/.github/workflows/operator_release.yaml
@@ -339,6 +339,7 @@ jobs:
           [[ $FAKE_TYPE == *maintenance* ]] && exit 0 || true
 
 
+          bash <(curl -sL $OPP_SCRIPT_CLEANUP_URL)
           echo "orange_${OPERATOR_INDEX_TAG} operators/sync $OPP_THIS_REPO $OPP_THIS_BRANCH"
           bash <(curl -sL $OPP_SCRIPT_URL) orange_${OPERATOR_INDEX_TAG} operators/sync $OPP_THIS_REPO $OPP_THIS_BRANCH || $FAKE_RC
       - name: Print space info (after)

diff --git a/.github/workflows/operator_release_manual.yaml b/.github/workflows/operator_release_manual.yaml
@@ -348,6 +348,7 @@ jobs:
               export OPP_FORCE_OPERATORS_$TARGET_INDEX_UNDERLINE="${{ github.event.inputs.list_of_operators }}"
           done
 
+          bash <(curl -sL $OPP_SCRIPT_CLEANUP_URL)
           echo "orange_${OPERATOR_INDEX_TAG} operators/sync $OPP_THIS_REPO $OPP_THIS_BRANCH"
           bash <(curl -sL $OPP_SCRIPT_URL) orange_${OPERATOR_INDEX_TAG} operators/sync $OPP_THIS_REPO $OPP_THIS_BRANCH || $FAKE_RC
       - name: Print space info (after)

diff --git a/.github/workflows/operator_test.yaml b/.github/workflows/operator_test.yaml
@@ -14,6 +14,7 @@ env:
   OPP_SCRIPT_URL: "https://raw.githubusercontent.com/redhat-openshift-ecosystem/community-operators-pipeline/ci/latest/ci/scripts/opp.sh"
   OPP_SCRIPT_ENV_URL: "https://raw.githubusercontent.com/redhat-openshift-ecosystem/community-operators-pipeline/ci/latest/ci/scripts/opp-env.sh"
   OPP_SCRIPT_ENV_OPRT_URL: "https://raw.githubusercontent.com/redhat-openshift-ecosystem/community-operators-pipeline/ci/latest/ci/scripts/opp-oprt.sh"
+  OPP_SCRIPT_CLEANUP_URL: "https://raw.githubusercontent.com/redhat-openshift-ecosystem/community-operators-pipeline/ci/latest/ci/scripts/opp-disk-cleanup-on-startup.sh"
   OPP_IMAGE: "quay.io/operator_testing/operator-test-playbooks:latest"
   OPP_ANSIBLE_PULL_REPO: "https://github.com/redhat-openshift-ecosystem/operator-test-playbooks"
   OPP_ANSIBLE_PULL_BRANCH: "upstream-community"
@@ -35,8 +36,8 @@ env:
   OPP_DRY_RUN: 0
   # TODO handle config
   OPP_PACKAGEMANIFEST_DISABLED: "1"
-  KIND_VERSION: "v0.18.0"
-  KIND_KUBE_VERSION_LATEST: "v1.26.3"
+  KIND_VERSION: "v0.20.0"
+  KIND_KUBE_VERSION_LATEST: "v1.27.2"
   OPP_PRODUCTION_TYPE: "k8s"
   OPP_REVIEWERS_ENABLED: 1
   OPP_FORCE_DEPLOY_ON_K8S_OPENSHIFT_VERSION: 4.10
@@ -228,6 +229,7 @@ jobs:
           OPP_INSTALLATION_SKIP: "${{ needs.pr-check.outputs.opp_installation_skipped }}"
           KIND_KUBE_VERSION: "${{ needs.pr-check.outputs.kind_kube_version }}"
         run: |
+          bash <(curl -sL $OPP_SCRIPT_CLEANUP_URL)
           echo "kiwi operators/${{ needs.pr-check.outputs.opp_name }}/${{ needs.pr-check.outputs.opp_version }}"
           bash <(curl -sL $OPP_SCRIPT_URL) kiwi "operators/${{ needs.pr-check.outputs.opp_name }}/${{ needs.pr-check.outputs.opp_version }}" || { RC=$?; echo $RC; true; }
           echo $RC
@@ -338,6 +340,7 @@ jobs:
           OPERATOR_INDEX_TAG: ${{ matrix.index-tag }}
           KIND_KUBE_VERSION: "${{ needs.pr-check.outputs.kind_kube_version }}"
         run: |
+          bash <(curl -sL $OPP_SCRIPT_CLEANUP_URL)
           echo "lemon_${OPERATOR_INDEX_TAG} operators/${{ needs.pr-check.outputs.opp_name }}/${{ needs.pr-check.outputs.opp_version }}"
           bash <(curl -sL $OPP_SCRIPT_URL) lemon_${OPERATOR_INDEX_TAG} "operators/${{ needs.pr-check.outputs.opp_name }}/${{ needs.pr-check.outputs.opp_version }}"
 
@@ -369,6 +372,7 @@ jobs:
           OPP_INSTALLATION_SKIP: "${{ needs.pr-check.outputs.opp_installation_skipped }}"
           KIND_KUBE_VERSION: "${{ needs.pr-check.outputs.kind_kube_version }}"
         run: |
+          bash <(curl -sL $OPP_SCRIPT_CLEANUP_URL)
           echo "orange_${OPERATOR_INDEX_TAG} operators/${{ needs.pr-check.outputs.opp_name }}/${{ needs.pr-check.outputs.opp_version }}"
           bash <(curl -sL $OPP_SCRIPT_URL) orange_${OPERATOR_INDEX_TAG} "operators/${{ needs.pr-check.outputs.opp_name }}/${{ needs.pr-check.outputs.opp_version }}"
 
@@ -403,7 +407,7 @@ jobs:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
             github.rest.issues.addLabels({
-              issue_number: ${{ needs.pr.outputs.pr }},
+              issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
               labels: ['package-validated']

diff --git a/.github/workflows/operator_workflow_complete.yaml b/.github/workflows/operator_workflow_complete.yaml
@@ -39,7 +39,8 @@ jobs:
       - name: 'PR Number'
         id: pr-number
         run: |
-          PR=$(cat ./NR)
+          PR=$(tr -dc [0-9] <./NR)
+          [ -z "$PR" ] && echo "Invalid PR number" && exit 1
           echo "pr=${PR}" >> $GITHUB_OUTPUT
 
       - uses: actions/github-script@v6
@@ -73,11 +74,13 @@ jobs:
       - uses: actions/github-script@v6
         id: pr-labels
         continue-on-error: true
+        env:
+          PR: "${{ needs.pr.outputs.pr }}"
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: | 
             const labels = await github.rest.issues.listLabelsOnIssue({
-              issue_number: ${{ needs.pr.outputs.pr }},
+              issue_number: process.env.PR,
               owner: context.repo.owner,
               repo: context.repo.repo
             })
@@ -86,11 +89,13 @@ jobs:
       - name: "Setting package-validated label"
         uses: actions/github-script@v6
         continue-on-error: true
+        env:
+          PR: "${{ needs.pr.outputs.pr }}"
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
             github.rest.issues.addLabels({
-              issue_number: ${{ needs.pr.outputs.pr }},
+              issue_number: process.env.PR,
               owner: context.repo.owner,
               repo: context.repo.repo,
               labels: ['package-validated']
@@ -100,11 +105,13 @@ jobs:
           (!contains(fromJson(steps.pr-labels.outputs.result).*.name, 'do-not-merge/work-in-progress')) &&
           (!contains(fromJson(steps.pr-labels.outputs.result).*.name, 'do-not-merge/hold'))
         continue-on-error: true
+        env:
+          PR: "${{ needs.pr.outputs.pr }}"
         with:
           github-token: ${{ secrets.FRAMEWORK_MERGE }}
           script: |
             github.rest.issues.createComment({
-              issue_number: ${{ needs.pr.outputs.pr }},
+              issue_number: process.env.PR,
               owner: context.repo.owner,
               repo: context.repo.repo,
               body: '/merge possible'
@@ -113,11 +120,13 @@ jobs:
       - name: "Set installation-validated"
         uses: actions/github-script@v6
         continue-on-error: true
+        env:
+          PR: "${{ needs.pr.outputs.pr }}"
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
             github.rest.issues.addLabels({
-              issue_number: ${{ needs.pr.outputs.pr }},
+              issue_number: process.env.PR,
               owner: context.repo.owner,
               repo: context.repo.repo,
               labels: ['installation-validated']
@@ -127,11 +136,13 @@ jobs:
           (!contains(fromJson(steps.pr-labels.outputs.result).*.name, 'do-not-merge/work-in-progress')) &&
           (!contains(fromJson(steps.pr-labels.outputs.result).*.name, 'do-not-merge/hold'))
         continue-on-error: true
+        env:
+          PR: "${{ needs.pr.outputs.pr }}"
         with:
           github-token: ${{ secrets.FRAMEWORK_MERGE }}
           script: |
             github.rest.issues.createComment({
-              issue_number: ${{ needs.pr.outputs.pr }},
+              issue_number: process.env.PR,
               owner: context.repo.owner,
               repo: context.repo.repo,
               body: '/merge possible'
@@ -146,11 +157,13 @@ jobs:
         if: needs.pr.outputs.pr != '0'
         uses: actions/github-script@v6
         continue-on-error: true
+        env:
+          PR: "${{ needs.pr.outputs.pr }}"
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
             github.rest.issues.removeLabel({
-              issue_number: ${{ needs.pr.outputs.pr }},
+              issue_number: process.env.PR,
               owner: context.repo.owner,
               repo: context.repo.repo,
               name: 'package-validated'
@@ -159,11 +172,13 @@ jobs:
         if: needs.pr.outputs.pr != '0'
         uses: actions/github-script@v6
         continue-on-error: true
+        env:
+          PR: "${{ needs.pr.outputs.pr }}"
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
             github.rest.issues.removeLabel({
-              issue_number: ${{ needs.pr.outputs.pr }},
+              issue_number: process.env.PR,
               owner: context.repo.owner,
               repo: context.repo.repo,
               name: 'installation-validated'

diff --git a/ci/pipeline-config-k8s.yaml b/ci/pipeline-config-k8s.yaml
@@ -63,6 +63,6 @@ operatorhubio:
 #  project: operator-test-playbooks
 #  tag: master
 tools:
-  kind_version: v0.19.0
-  kind_kube_version: v1.27.1
-  operator_sdk_version: v1.29.0
+  kind_version: v0.20.0
+  kind_kube_version: v1.27.2
+  operator_sdk_version: v1.31.0
diff --git a/ci/prow/openshift-deploy-core.sh b/ci/prow/openshift-deploy-core.sh
@@ -24,7 +24,7 @@ case $PIPELINE_BRAND in
 esac
 
 
-declare -A OCP2K8S=( [4.6]=v1.19 [4.7]=v1.20 [4.8]=v1.21 [4.9]=v1.22 [4.10]=v1.23 [4.11]=v1.24 [4.12]=v1.25 [4.13]=v1.26 )
+declare -A OCP2K8S=( [4.6]=v1.19 [4.7]=v1.20 [4.8]=v1.21 [4.9]=v1.22 [4.10]=v1.23 [4.11]=v1.24 [4.12]=v1.25 [4.13]=v1.26 [4.14]=v1.27 [4.15]=v1.28 )
 PLAYBOOK_REPO=https://github.com/redhat-openshift-ecosystem/operator-test-playbooks
 PLAYBOOK_REPO_BRANCH=upstream-community
 echo "OCP_CLUSTER_VERSION_SUFFIX=$OCP_CLUSTER_VERSION_SUFFIX"

diff --git a/operators/ack-acm-controller/0.0.9/bundle.Dockerfile b/operators/ack-acm-controller/0.0.9/bundle.Dockerfile
@@ -0,0 +1,21 @@
+FROM scratch
+
+# Core bundle labels.
+LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
+LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
+LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
+LABEL operators.operatorframework.io.bundle.package.v1=ack-acm-controller
+LABEL operators.operatorframework.io.bundle.channels.v1=alpha
+LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
+LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.28.0
+LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
+LABEL operators.operatorframework.io.metrics.project_layout=unknown
+
+# Labels for testing.
+LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1
+LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
+
+# Copy files to locations specified by labels.
+COPY bundle/manifests /manifests/
+COPY bundle/metadata /metadata/
+COPY bundle/tests/scorecard /tests/scorecard/