Skip to content

Commit 1eba9cc

Browse files
authored
Remove nginx-bot where possible (#518)
1 parent c9bdb39 commit 1eba9cc

File tree

2 files changed

+37
-40
lines changed

2 files changed

+37
-40
lines changed

.github/workflows/ci.yml

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -173,38 +173,39 @@ jobs:
173173
./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
174174
done
175175
176-
- name: Make
177-
run: |
178-
make bundle USE_IMAGE_DIGESTS=true
179-
180-
- name: Checkout certified-operators repo
181-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
182-
with:
183-
token: ${{ secrets.NGINX_PAT }}
184-
repository: nginx-bot/certified-operators
185-
path: certified-operators
186-
187-
- name: Update certified-operators repo
188-
working-directory: certified-operators/operators/nginx-ingress-operator
189-
run: |
190-
mkdir v${{ needs.build.outputs.version }}
191-
cp -R ../../../bundle/manifests v${{ needs.build.outputs.version }}/
192-
cp -R ../../../bundle/metadata v${{ needs.build.outputs.version }}/
193-
194-
- name: Commit changes
195-
uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
196-
with:
197-
commit_message: operator nginx-ingress-operator (v${{ needs.build.outputs.version }})
198-
commit_author: nginx-bot <[email protected]>
199-
commit_user_name: nginx-bot
200-
commit_user_email: [email protected]
201-
create_branch: true
202-
branch: update-nginx-ingress-operator-to-v${{ needs.build.outputs.version }}
203-
repository: certified-operators
204-
205-
- name: Create PR
206-
working-directory: certified-operators
207-
run: |
208-
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
209-
env:
210-
GITHUB_TOKEN: ${{ secrets.NGINX_PAT }}
176+
## Disable PR creation until issues with NGINX_PAT are resolved
177+
# - name: Make
178+
# run: |
179+
# make bundle USE_IMAGE_DIGESTS=true
180+
181+
# - name: Checkout certified-operators repo
182+
# uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
183+
# with:
184+
# token: ${{ secrets.NGINX_PAT }}
185+
# repository: nginx-bot/certified-operators
186+
# path: certified-operators
187+
188+
# - name: Update certified-operators repo
189+
# working-directory: certified-operators/operators/nginx-ingress-operator
190+
# run: |
191+
# mkdir v${{ needs.build.outputs.version }}
192+
# cp -R ../../../bundle/manifests v${{ needs.build.outputs.version }}/
193+
# cp -R ../../../bundle/metadata v${{ needs.build.outputs.version }}/
194+
195+
# - name: Commit changes
196+
# uses: stefanzweifel/git-auto-commit-action@b863ae1933cb653a53c021fe36dbb774e1fb9403 # v5.2.0
197+
# with:
198+
# commit_message: operator nginx-ingress-operator (v${{ needs.build.outputs.version }})
199+
# commit_author: nginx-bot <[email protected]>
200+
# commit_user_name: nginx-bot
201+
# commit_user_email: [email protected]
202+
# create_branch: true
203+
# branch: update-nginx-ingress-operator-to-v${{ needs.build.outputs.version }}
204+
# repository: certified-operators
205+
206+
# - name: Create PR
207+
# working-directory: certified-operators
208+
# run: |
209+
# 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
210+
# env:
211+
# GITHUB_TOKEN: ${{ secrets.NGINX_PAT }}

.github/workflows/sync-chart.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ jobs:
3232
steps:
3333
- name: Checkout Operator
3434
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
35-
with:
36-
token: ${{ secrets.NGINX_PAT }}
3735

3836
- name: Checkout Kubernetes json schemas
3937
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -66,7 +64,6 @@ jobs:
6664
rm -f nginx-ingress/templates/controller-role.yaml
6765
rm -f nginx-ingress/templates/controller-rolebinding.yaml
6866
sed -i '14s/name: {{ include "nginx-ingress.fullname" . }}/name: nginx-ingress-operator-nginx-ingress-admin/' nginx-ingress/templates/clusterrolebinding.yaml
69-
7067
mv ../schemas/${{ inputs.k8s_version }} nginx-ingress/${{ inputs.k8s_version }}
7168
sed -i -e "s#ref\":.*_def#ref\": \"file://./helm-charts/nginx-ingress/${{ inputs.k8s_version }}/_def#" nginx-ingress/values.schema.json
7269
rm -rf ../schemas
@@ -108,11 +105,10 @@ jobs:
108105
- name: Create Pull Request
109106
uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
110107
with:
111-
token: ${{ secrets.NGINX_PAT }}
108+
token: ${{ secrets.GITHUB_TOKEN }}
112109
commit-message: Update NGINX Ingress Controller to ${{ steps.sync.outputs.new_nic_version }}
113110
title: Update NGINX Ingress Controller to ${{ steps.sync.outputs.new_nic_version }}
114111
branch: feat/update-nic-to-${{ steps.sync.outputs.new_nic_version }}
115-
author: nginx-bot <[email protected]>
116112
body: |
117113
This automated PR updates the NGINX Ingress Controller to ${{ steps.sync.outputs.new_nic_version }}.
118114
The Helm Chart was updated to ${{ inputs.chart_version }}.

0 commit comments

Comments
 (0)