From 3c51ea38bda40ab4358447bf0e2bbb3352d9531d Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Fri, 6 Dec 2024 13:23:26 +0000 Subject: [PATCH 1/3] remove marketplace plus images from docs for 4.0.0 --- site/content/technical-specifications.md | 41 ------------------------ 1 file changed, 41 deletions(-) diff --git a/site/content/technical-specifications.md b/site/content/technical-specifications.md index c5b401178f..4bab37dac3 100644 --- a/site/content/technical-specifications.md +++ b/site/content/technical-specifications.md @@ -88,47 +88,6 @@ NGINX Plus images are available through the F5 Container registry `private-regis --- -#### **AWS Marketplace** - -NGINX Plus images are available through the AWS Marketplace. - -View the [Use the AWS Marketplace Ingress Controller image]({{< relref "/installation/nic-images/use-aws-image.md" >}}) topic for details on how to set up the required IAM resources in your EKS cluster. - -{{< bootstrap-table "table table-striped table-bordered table-responsive" >}} -|
Name
|
Base image
|
Third-party modules
| AWS Marketplace Link | Architectures | -| ---| ---| --- | --- | --- | -|Debian-based image | ``debian:12-slim`` | NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog | [F5 NGINX Ingress Controller](https://aws.amazon.com/marketplace/pp/prodview-fx3faxl7zqeau) | amd64 | -|Debian-based image with NGINX App Protect WAF | ``debian:12-slim`` | NGINX App Protect WAF

NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog | [F5 NGINX Ingress Controller with F5 NGINX App Protect WAF](https://aws.amazon.com/marketplace/pp/prodview-vnrnxbf6u3nra) | amd64 | -|Debian-based image with NGINX App Protect DoS | ``debian:12-slim`` | NGINX App Protect DoS

NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog | [F5 NGINX Ingress Controller with F5 NGINX App Protect WAF and DoS](https://aws.amazon.com/marketplace/pp/prodview-yltaqwzwrnhco) | amd64 | -|Debian-based image with NGINX App Protect WAF and DoS | ``debian:12-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 | -{{% /bootstrap-table %}} - ---- - -#### **Google Cloud Marketplace** -NGINX Plus images are available through the Google Cloud Marketplace. - -View the [Use the GCP Marketplace NGINX Ingress Controller image]({{< relref "/installation/nic-images/use-gcp-image.md" >}}) topic for details on how to use them. - -{{< bootstrap-table "table table-striped table-bordered table-responsive" >}} -|
Name
|
Base image
|
Third-party modules
| GCP Marketplace Link | Architectures | -| ---| ---| --- | --- | --- | -|Debian-based image | ``debian:12-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 WAF | ``debian:12-slim`` | NGINX App Protect WAF

NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog | [F5 NGINX Ingress Controller w/ F5 NGINX App Protect WAF](https://console.cloud.google.com/marketplace/product/f5-7626-networks-public/nginx-ingress-plus-nap) | amd64 | -{{% /bootstrap-table %}} - -#### **Microsoft Azure Marketplace** -NGINX Plus images are available through the Microsoft Azure Marketplace. - -{{< bootstrap-table "table table-striped table-bordered table-responsive" >}} -|
Name
|
Base image
|
Third-party modules
| Azure Marketplace Link | Architectures | -| ---| ---| --- | --- | --- | -|Debian-based image | ``debian:12-slim`` | NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog | [F5 NGINX Ingress Controller](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/nginxinc.nginx_ingress_premium) | amd64 | -|Debian-based image with NGINX App Protect WAF | ``debian:12-slim`` | NGINX App Protect WAF

NGINX Plus JavaScript and OpenTracing modules

OpenTracing tracers for Jaeger

Zipkin and Datadog | [F5 NGINX Ingress Controller w/ F5 NGINX App Protect WAF](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/nginxinc.nginx_ingress_premium_waf) | amd64 | -{{% /bootstrap-table %}} - ---- - ### Custom images You can customize an existing Dockerfile or use it as a reference to create a new one, which is necessary when: From 35378443cce15fe83ee5655cad67489af90e3fcd Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Fri, 6 Dec 2024 13:47:10 +0000 Subject: [PATCH 2/3] remove marketplace pages from docs --- hack/changelog-template.txt | 5 +---- site/content/installation/nic-images/use-aws-image.md | 1 + site/content/installation/nic-images/use-gcp-image.md | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hack/changelog-template.txt b/hack/changelog-template.txt index 3d48f310cf..cadedd12a7 100644 --- a/hack/changelog-template.txt +++ b/hack/changelog-template.txt @@ -18,10 +18,7 @@ [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, -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 NGINX Plus, use the %%IC_VERSION%% images from the F5 Container registry or build your own image using the %%IC_VERSION%% source code - For Helm, use version %%HELM_CHART_VERSION%% of the chart. ### Supported Platforms diff --git a/site/content/installation/nic-images/use-aws-image.md b/site/content/installation/nic-images/use-aws-image.md index fd6ae28c0f..c0b140fb3f 100644 --- a/site/content/installation/nic-images/use-aws-image.md +++ b/site/content/installation/nic-images/use-aws-image.md @@ -5,6 +5,7 @@ doctypes: title: Use the AWS Marketplace NGINX Ingress Controller image toc: true weight: 200 +draft: true --- This guide walks you through the steps to set up NGINX Ingress Controller using the AWS Marketplace diff --git a/site/content/installation/nic-images/use-gcp-image.md b/site/content/installation/nic-images/use-gcp-image.md index 7b6f9c27b1..7fe271e1df 100644 --- a/site/content/installation/nic-images/use-gcp-image.md +++ b/site/content/installation/nic-images/use-gcp-image.md @@ -5,6 +5,7 @@ doctypes: title: Use the GCP Marketplace NGINX Ingress Controller image toc: true weight: 300 +draft: true --- Follow these steps to deploy F5 NGINX Ingress Controller through the GCP Marketplace. From 25a93ce9a4ae1547d3782cab2b178b423b7cf3c4 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Fri, 6 Dec 2024 15:10:25 +0000 Subject: [PATCH 3/3] remove AWS images from readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 09a254efdd..f8652c3204 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,7 @@ your links to the correct versions: | Version | Description | Image for NGINX | Image for NGINX Plus | Installation Manifests and Helm Chart | Documentation and Examples | | ------- | ----------- | --------------- | -------------------- | ---------------------------------------| -------------------------- | -| Latest stable release | For production use | Use the 3.7.2 images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [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) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-ingress-controller-image/). | Use the 3.7.2 images from the [F5 Container Registry](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/) 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](https://docs.nginx.com/nginx-ingress-controller/installation/build-nginx-ingress-controller/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v3.7.2/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v3.7.2/charts/nginx-ingress). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). | +| Latest stable release | For production use | Use the 3.7.2 images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [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) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-ingress-controller-image/). | Use the 3.7.2 images from the [F5 Container Registry](https://docs.nginx.com/nginx-ingress-controller/installation/pulling-ingress-controller-image/) or [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-nginx-ingress-controller/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v3.7.2/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v3.7.2/charts/nginx-ingress). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). | | Edge/Nightly | For testing and experimenting | Use the edge or nightly images from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/), [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) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-nginx-ingress-controller/). | [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/build-nginx-ingress-controller/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/main/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/main/charts/nginx-ingress). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/main/site/content). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/main/examples). | ## SBOM (Software Bill of Materials)