From e9fdd36f50dbdd67aa8af01bd2468d2e27f673aa Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 30 Jun 2025 11:46:31 +0100 Subject: [PATCH 1/2] remove NGINX_PAT for sync-chart.yml --- .github/workflows/sync-chart.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/sync-chart.yml b/.github/workflows/sync-chart.yml index 2e14ec58..17f6d36f 100644 --- a/.github/workflows/sync-chart.yml +++ b/.github/workflows/sync-chart.yml @@ -32,8 +32,6 @@ jobs: steps: - name: Checkout Operator uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - token: ${{ secrets.NGINX_PAT }} - name: Checkout Kubernetes json schemas uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 @@ -66,7 +64,6 @@ jobs: rm -f nginx-ingress/templates/controller-role.yaml rm -f nginx-ingress/templates/controller-rolebinding.yaml sed -i '14s/name: {{ include "nginx-ingress.fullname" . }}/name: nginx-ingress-operator-nginx-ingress-admin/' nginx-ingress/templates/clusterrolebinding.yaml - mv ../schemas/${{ inputs.k8s_version }} nginx-ingress/${{ inputs.k8s_version }} sed -i -e "s#ref\":.*_def#ref\": \"file://./helm-charts/nginx-ingress/${{ inputs.k8s_version }}/_def#" nginx-ingress/values.schema.json rm -rf ../schemas @@ -108,11 +105,10 @@ jobs: - name: Create Pull Request uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8 with: - token: ${{ secrets.NGINX_PAT }} + token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update NGINX Ingress Controller to ${{ steps.sync.outputs.new_nic_version }} title: Update NGINX Ingress Controller to ${{ steps.sync.outputs.new_nic_version }} branch: feat/update-nic-to-${{ steps.sync.outputs.new_nic_version }} - author: nginx-bot body: | This automated PR updates the NGINX Ingress Controller to ${{ steps.sync.outputs.new_nic_version }}. The Helm Chart was updated to ${{ inputs.chart_version }}. From 290a0ddc8d670ab465d7fac792ae98c514f83ca2 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 30 Jun 2025 11:55:19 +0100 Subject: [PATCH 2/2] temporarily disable PR generation --- .github/workflows/ci.yml | 71 ++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da258d8d..191251b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -173,38 +173,39 @@ jobs: ./preflight check container quay.io/nginx/nginx-ingress-operator:${{ needs.build.outputs.version }} --pyxis-api-token ${{ secrets.PYXIS_API_TOKEN }} --certification-project-id ${{ secrets.CERTIFICATION_PROJECT_ID }} --platform $architecture --submit done - - name: Make - run: | - make bundle USE_IMAGE_DIGESTS=true - - - name: Checkout certified-operators repo - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - token: ${{ secrets.NGINX_PAT }} - repository: nginx-bot/certified-operators - path: certified-operators - - - name: Update certified-operators repo - working-directory: certified-operators/operators/nginx-ingress-operator - run: | - mkdir v${{ needs.build.outputs.version }} - cp -R ../../../bundle/manifests v${{ needs.build.outputs.version }}/ - cp -R ../../../bundle/metadata v${{ needs.build.outputs.version }}/ - - - name: Commit changes - uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0 - with: - commit_message: operator nginx-ingress-operator (v${{ needs.build.outputs.version }}) - commit_author: nginx-bot - commit_user_name: nginx-bot - commit_user_email: integrations@nginx.com - create_branch: true - branch: update-nginx-ingress-operator-to-v${{ needs.build.outputs.version }} - repository: certified-operators - - - name: Create PR - working-directory: certified-operators - run: | - gh pr create --title "operator nginx-ingress-operator (v${{ needs.build.outputs.version }})" --body "Update nginx-ingress-operator to v${{ needs.build.outputs.version }}" --head nginx-bot:update-nginx-ingress-operator-to-v${{ needs.build.outputs.version }} --base main --repo redhat-openshift-ecosystem/certified-operators - env: - GITHUB_TOKEN: ${{ secrets.NGINX_PAT }} + ## Disable PR creation until issues with NGINX_PAT are resolved + # - name: Make + # run: | + # make bundle USE_IMAGE_DIGESTS=true + + # - name: Checkout certified-operators repo + # uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + # with: + # token: ${{ secrets.NGINX_PAT }} + # repository: nginx-bot/certified-operators + # path: certified-operators + + # - name: Update certified-operators repo + # working-directory: certified-operators/operators/nginx-ingress-operator + # run: | + # mkdir v${{ needs.build.outputs.version }} + # cp -R ../../../bundle/manifests v${{ needs.build.outputs.version }}/ + # cp -R ../../../bundle/metadata v${{ needs.build.outputs.version }}/ + + # - name: Commit changes + # uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0 + # with: + # commit_message: operator nginx-ingress-operator (v${{ needs.build.outputs.version }}) + # commit_author: nginx-bot + # commit_user_name: nginx-bot + # commit_user_email: integrations@nginx.com + # create_branch: true + # branch: update-nginx-ingress-operator-to-v${{ needs.build.outputs.version }} + # repository: certified-operators + + # - name: Create PR + # working-directory: certified-operators + # run: | + # gh pr create --title "operator nginx-ingress-operator (v${{ needs.build.outputs.version }})" --body "Update nginx-ingress-operator to v${{ needs.build.outputs.version }}" --head nginx-bot:update-nginx-ingress-operator-to-v${{ needs.build.outputs.version }} --base main --repo redhat-openshift-ecosystem/certified-operators + # env: + # GITHUB_TOKEN: ${{ secrets.NGINX_PAT }}