From 3b7b002b5cb530964c8b3fb61238be0bc6e157dc Mon Sep 17 00:00:00 2001 From: Luca Comellini Date: Fri, 2 Jun 2023 17:29:45 -0700 Subject: [PATCH] Add GCP Marketplace to technical-specifications and release (#3951) --- .github/workflows/ci.yml | 70 ++++++++++++------------ docs/content/technical-specifications.md | 9 +++ hack/minor-changelog-template.txt | 2 +- 3 files changed, 45 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5cf0d2da08..eb8f35f7f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ on: - main - release-* tags: - - 'v[0-9]+.[0-9]+.[0-9]+' + - "v[0-9]+.[0-9]+.[0-9]+" pull_request: branches: - main @@ -16,7 +16,7 @@ on: - reopened - synchronize schedule: - - cron: '0 4 * * *' # run every day at 04:00 UTC + - cron: "0 4 * * *" # run every day at 04:00 UTC defaults: run: @@ -27,7 +27,6 @@ concurrency: cancel-in-progress: true jobs: - checks: name: Checks and variables runs-on: ubuntu-22.04 @@ -92,16 +91,16 @@ jobs: - name: Create/Update Draft uses: lucacome/draft-release@b79be3ff634f771230b2b6ee9f47308c5793671a # v0.2.0 with: - minor-label: 'enhancement' - major-label: 'change' + minor-label: "enhancement" + major-label: "change" publish: ${{ startsWith(github.ref, 'refs/tags/') }} collapse-after: 50 variables: | helm-chart=${{ needs.checks.outputs.chart_version }} notes-footer: | ## Upgrade - - For NGINX, use the {{version}} image 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/nginxinc/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}} image from the F5 Container registry or the [AWS Marketplace](https://aws.amazon.com/marketplace/search/?CREATOR=741df81b-dfdc-4d36-b8da-945ea66b522c&FULFILLMENT_OPTION_TYPE=CONTAINER&filters=CREATOR%2CFULFILLMENT_OPTION_TYPE) or build your own image using the {{version}} source code. + - 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/nginxinc/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) or build your own image using the {{version}} source code. - For Helm, use version {{helm-chart}} of the chart. ## Resources @@ -163,10 +162,10 @@ jobs: strategy: matrix: include: - - image: debian - type: oss - - image: debian-plus - type: plus + - image: debian + type: oss + - image: debian-plus + type: plus steps: - name: Checkout Repository uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 @@ -181,7 +180,7 @@ jobs: uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4.0.0 with: file: build/Dockerfile - context: '.' + context: "." cache-from: type=gha,scope=${{ matrix.image }} target: goreleaser tags: ${{ matrix.type }}:${{ github.sha }} @@ -270,7 +269,7 @@ jobs: uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671 # v4.0.0 with: file: tests/docker/Dockerfile - context: '.' + context: "." cache-from: type=gha,scope=test-runner cache-to: type=gha,scope=test-runner,mode=max tags: test-runner:${{ github.sha }} @@ -308,13 +307,14 @@ jobs: name: Build Docker OSS needs: smoke-tests strategy: - fail-fast: false - matrix: - image: [debian, alpine] - platforms: ["linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"] - include: - - image: ubi - platforms: "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x" + fail-fast: false + matrix: + image: [debian, alpine] + platforms: + ["linux/arm, linux/arm64, linux/amd64, linux/ppc64le, linux/s390x"] + include: + - image: ubi + platforms: "linux/arm64, linux/amd64, linux/ppc64le, linux/s390x" uses: ./.github/workflows/build-oss.yml with: platforms: ${{ matrix.platforms }} @@ -325,15 +325,15 @@ jobs: name: Build Docker Plus needs: build-docker strategy: - fail-fast: false - matrix: - image: [debian-plus, alpine-plus] - platforms: ["linux/arm64, linux/amd64"] - target: [goreleaser, aws] - include: - - image: ubi-plus - platforms: "linux/arm64, linux/amd64, linux/s390x" - target: goreleaser + fail-fast: false + matrix: + image: [debian-plus, alpine-plus] + platforms: ["linux/arm64, linux/amd64"] + target: [goreleaser, aws] + include: + - image: ubi-plus + platforms: "linux/arm64, linux/amd64, linux/s390x" + target: goreleaser uses: ./.github/workflows/build-plus.yml with: platforms: ${{ matrix.platforms }} @@ -345,12 +345,12 @@ jobs: name: Build Docker NAP needs: build-docker-plus strategy: - fail-fast: false - matrix: - image: [debian-plus-nap, ubi-plus-nap] - platforms: ["linux/amd64"] - target: [goreleaser, aws] - nap_modules: [dos, waf, "waf,dos"] + fail-fast: false + matrix: + image: [debian-plus-nap, ubi-plus-nap] + platforms: ["linux/amd64"] + target: [goreleaser, aws] + nap_modules: [dos, waf, "waf,dos"] uses: ./.github/workflows/build-plus.yml with: platforms: ${{ matrix.platforms }} diff --git a/docs/content/technical-specifications.md b/docs/content/technical-specifications.md index 67bf059f12..a7187b1208 100644 --- a/docs/content/technical-specifications.md +++ b/docs/content/technical-specifications.md @@ -85,6 +85,15 @@ We also provide NGINX Plus images through the AWS Marketplace. Please see [Using |Debian-based image with NGINX App Protect WAF and DoS | ``debian:11-slim`` | NGINX App Protect WAF and DoS, NGINX Plus JavaScript and OpenTracing modules, OpenTracing tracers for Jaeger, Zipkin and Datadog | [F5 NGINX Ingress Controller with F5 NGINX App Protect DoS](https://aws.amazon.com/marketplace/pp/prodview-sghjw2csktega) | amd64 | {{% /table %}} +We also provide NGINX Plus images through the Google Cloud Marketplace. Please see [Using GCP Marketplace Ingress Controller](/nginx-ingress-controller/installation/using-gcp-marketplace-package/) for details on how use them. + +{{% table %}} +|Name | Base image | Third-party modules | GCP Marketplace Link | Architectures | +| ---| ---| --- | --- | --- | +|Debian-based image | ``debian:11-slim`` | NGINX Plus JavaScript and OpenTracing modules, OpenTracing tracers for Jaeger, Zipkin and Datadog | [F5 NGINX Ingress Controller](https://console.cloud.google.com/marketplace/product/f5-7626-networks-public/nginx-ingress-plus) | amd64 | +|Debian-based image with NGINX App Protect DoS | ``debian:11-slim`` | NGINX App Protect DoS, NGINX Plus JavaScript and OpenTracing modules, OpenTracing tracers for Jaeger, Zipkin and Datadog | [F5 NGINX Ingress Controller w/ F5 NGINX App Protect DoS](https://console.cloud.google.com/marketplace/product/f5-7626-networks-public/nginx-ingress-plus-dos) | amd64 | +{{% /table %}} + ### Custom Images You can customize an existing Dockerfile or use it as a reference to create a new one, which is necessary for the following cases: diff --git a/hack/minor-changelog-template.txt b/hack/minor-changelog-template.txt index ad6f3b8a44..74dcb5464f 100644 --- a/hack/minor-changelog-template.txt +++ b/hack/minor-changelog-template.txt @@ -11,5 +11,5 @@ HELM CHART: UPGRADE: * For NGINX, use the %%IC_VERSION%% images from our [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/tags?page=1&ordering=last_updated&name=%%IC_VERSION%%), [GitHub Container](https://github.com/nginxinc/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 %%IC_VERSION%% images from the F5 Container registry or build your own image using the %%IC_VERSION%% source code. +* For NGINX Plus, use the %%IC_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) or build your own image using the %%IC_VERSION%% source code * For Helm, use version %%HELM_CHART_VERSION%% of the chart.