Skip to content

Remove nginx-bot where possible #518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 30, 2025
Merged

Remove nginx-bot where possible #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9fdd36
remove NGINX_PAT for sync-chart.yml
pdabelf5 Jun 30, 2025
290a0dd
temporarily disable PR generation
pdabelf5 Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 36 additions & 35 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
commit_user_name: nginx-bot
commit_user_email: [email protected]
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 <[email protected]>
# commit_user_name: nginx-bot
# commit_user_email: [email protected]
# 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 }}
6 changes: 1 addition & 5 deletions .github/workflows/sync-chart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 <[email protected]>
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 }}.
Expand Down