From 3cc63646cc12ae9040061bc5e8c9e71c3d520f26 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Fri, 20 Jun 2025 17:10:05 +0100 Subject: [PATCH 1/2] Update references to migrated nginxinc projects --- .github/workflows/image-promotion.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/update-release-draft.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/image-promotion.yml b/.github/workflows/image-promotion.yml index b9197c15c0..108c7e347d 100644 --- a/.github/workflows/image-promotion.yml +++ b/.github/workflows/image-promotion.yml @@ -688,5 +688,5 @@ jobs: - Documentation -- https://docs.nginx.com/nginx-ingress-controller/ - Configuration examples -- https://github.com/nginx/kubernetes-ingress/tree/{{version}}/examples - Helm Chart -- https://github.com/nginx/kubernetes-ingress/tree/{{version}}/deployments/helm-chart - - Operator -- https://github.com/nginxinc/nginx-ingress-helm-operator + - Operator -- https://github.com/nginx/nginx-ingress-helm-operator if: ${{ github.event_name == 'push' && contains(github.ref_name, 'release-') }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 43525de467..fc45702327 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -319,7 +319,7 @@ jobs: # github-token: ${{ secrets.NGINX_PAT }} # script: | # await github.rest.actions.createWorkflowDispatch({ - # owner: 'nginxinc', + # owner: context.repo.owner, # repo: 'nginx-ingress-helm-operator', # workflow_id: 'sync-chart.yml', # ref: 'main', diff --git a/.github/workflows/update-release-draft.yml b/.github/workflows/update-release-draft.yml index 09fad2a4a6..33823346f3 100644 --- a/.github/workflows/update-release-draft.yml +++ b/.github/workflows/update-release-draft.yml @@ -80,4 +80,4 @@ jobs: - Documentation -- https://docs.nginx.com/nginx-ingress-controller/ - Configuration examples -- https://github.com/nginx/kubernetes-ingress/tree/{{version}}/examples - Helm Chart -- https://github.com/nginx/kubernetes-ingress/tree/{{version}}/deployments/helm-chart - - Operator -- https://github.com/nginxinc/nginx-ingress-helm-operator + - Operator -- https://github.com/nginx/nginx-ingress-helm-operator From 3e204b43bcc44ac6dc3df0c5709f26e56a1150f8 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Mon, 23 Jun 2025 10:20:21 +0100 Subject: [PATCH 2/2] Remove references to the Marketplace images --- .github/workflows/image-promotion.yml | 2 +- .github/workflows/update-release-draft.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/image-promotion.yml b/.github/workflows/image-promotion.yml index 108c7e347d..7949265a9e 100644 --- a/.github/workflows/image-promotion.yml +++ b/.github/workflows/image-promotion.yml @@ -681,7 +681,7 @@ jobs: notes-footer: | ## Upgrade - For NGINX, use the {{version}} images from our [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/tags?page=1&ordering=last_updated&name={{version-number}}), [GitHub Container](https://github.com/nginx/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress). - - For NGINX Plus, use the {{version}} images from the F5 Container registry, the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE), the [GCP Marketplace](https://console.cloud.google.com/marketplace/browse?filter=partner:F5,%20Inc.&filter=solution-type:k8s&filter=category:networking), [Azure Marketplace](https://azuremarketplace.microsoft.com/en-gb/marketplace/apps/category/containers?page=1&search=f5&subcategories=container-apps) or build your own image using the {{version}} source code. + - For NGINX Plus, use the {{version}} images from the F5 Container registry or build your own image using the {{version}} source code. - For Helm, use version {{helm-chart}} of the chart. ## Resources diff --git a/.github/workflows/update-release-draft.yml b/.github/workflows/update-release-draft.yml index 33823346f3..f844431203 100644 --- a/.github/workflows/update-release-draft.yml +++ b/.github/workflows/update-release-draft.yml @@ -73,7 +73,7 @@ jobs: notes-footer: | ## Upgrade - For NGINX, use the {{version}} images from our [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/tags?page=1&ordering=last_updated&name={{version-number}}), [GitHub Container](https://github.com/nginx/kubernetes-ingress/pkgs/container/kubernetes-ingress), [Amazon ECR Public Gallery](https://gallery.ecr.aws/nginx/nginx-ingress) or [Quay.io](https://quay.io/repository/nginx/nginx-ingress). - - For NGINX Plus, use the {{version}} images from the F5 Container registry, the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE), the [GCP Marketplace](https://console.cloud.google.com/marketplace/browse?filter=partner:F5,%20Inc.&filter=solution-type:k8s&filter=category:networking), [Azure Marketplace](https://azuremarketplace.microsoft.com/en-gb/marketplace/apps/category/containers?page=1&search=f5&subcategories=container-apps) or build your own image using the {{version}} source code. + - For NGINX Plus, use the {{version}} images from the F5 Container registry or build your own image using the {{version}} source code. - For Helm, use version {{helm-chart}} of the chart. ## Resources