Merge release 2.0.1 to master (#2064)

* Remove note from operator installation (#2049) * Use release specific repo for NGINX Plus on Debian (#2051) * fix issues with the 404 and robots.txts redirects * Release 2.0.1 (#2062) Co-authored-by: Ciara Stacke <18287516+ciarams87@users.noreply.github.com> Co-authored-by: Jodie Putrino <j.putrino@f5.com>
nginx · Oct 8, 2021 · ca1bbdf · ca1bbdf
2 parents 6bf1069 + bec3082
commit ca1bbdf
Show file tree

Hide file tree

Showing 35 changed files with 147 additions and 103 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+### 2.0.1
+
+An automatically generated list of changes can be found on Github at: [2.0.1 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.1)
+
+A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website.
+
+### 1.12.2
+
+An automatically generated list of changes can be found on Github at: [1.12.2 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.12.2)
+
+A curated list of changes can be found in the [Releases](http://docs.nginx.com/nginx-ingress-controller/releases/) page on NGINX Documentation website.
+
 ### 2.0.0
 
 An automatically generated list of changes can be found on Github at: [2.0.0 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.0)

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ Read [this doc](https://docs.nginx.com/nginx-ingress-controller/intro/nginx-plus
 
 We publish Ingress controller releases on GitHub. See our [releases page](https://github.com/nginxinc/kubernetes-ingress/releases).
 
-The latest stable release is [2.0.0](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.0). For production use, we recommend that you choose the latest stable release.  As an alternative, you can choose the *edge* version built from the [latest commit](https://github.com/nginxinc/kubernetes-ingress/commits/master) from the master branch. The edge version is useful for experimenting with new features that are not yet published in a stable release.
+The latest stable release is [2.0.1](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v2.0.1). For production use, we recommend that you choose the latest stable release.  As an alternative, you can choose the *edge* version built from the [latest commit](https://github.com/nginxinc/kubernetes-ingress/commits/master) from the master branch. The edge version is useful for experimenting with new features that are not yet published in a stable release.
 
 To use the Ingress controller, you need to have access to:
 * An Ingress controller image.
@@ -66,7 +66,7 @@ The table below summarizes the options regarding the images, manifests, helm cha
 
 | Version | Description |  Image for NGINX | Image for NGINX Plus | Installation Manifests and Helm Chart | Documentation and Examples |
 | ------- | ----------- | --------------- | -------------------- | ---------------------------------------| -------------------------- |
-| Latest stable release | For production use | `nginx/nginx-ingress:2.0.0`, `nginx/nginx-ingress:2.0.0-alpine` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | Use the 2.0.0 image 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/building-ingress-controller-image/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.0/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.0/deployments/helm-chart). | [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 | `nginx/nginx-ingress:2.0.1`, `nginx/nginx-ingress:2.0.1-alpine` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/) or [build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | Use the 2.0.1 image 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/building-ingress-controller-image/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.1/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.1/deployments/helm-chart). | [Documentation](https://docs.nginx.com/nginx-ingress-controller/). [Examples](https://docs.nginx.com/nginx-ingress-controller/configuration/configuration-examples/). |
 | Edge | For testing and experimenting | `nginx/nginx-ingress:edge`, `nginx/nginx-ingress:edge-alpine` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/) or [build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/master/docs/content/installation/building-ingress-controller-image.md). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/master/docs/content/installation/building-ingress-controller-image.md). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/master/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/master/deployments/helm-chart). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/master/docs/content). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples). |
 
 ## Contacts

diff --git a/deployments/daemon-set/nginx-ingress.yaml b/deployments/daemon-set/nginx-ingress.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx/nginx-ingress:2.0.0
+      - image: nginx/nginx-ingress:2.0.1
         imagePullPolicy: IfNotPresent
         name: nginx-ingress
         ports:

diff --git a/deployments/daemon-set/nginx-plus-ingress.yaml b/deployments/daemon-set/nginx-plus-ingress.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx-plus-ingress:2.0.0
+      - image: nginx-plus-ingress:2.0.1
         imagePullPolicy: IfNotPresent
         name: nginx-plus-ingress
         ports:

diff --git a/deployments/deployment/nginx-ingress.yaml b/deployments/deployment/nginx-ingress.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx/nginx-ingress:2.0.0
+      - image: nginx/nginx-ingress:2.0.1
         imagePullPolicy: IfNotPresent
         name: nginx-ingress
         ports:

diff --git a/deployments/deployment/nginx-plus-ingress.yaml b/deployments/deployment/nginx-plus-ingress.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx-plus-ingress:2.0.0
+      - image: nginx-plus-ingress:2.0.1
         imagePullPolicy: IfNotPresent
         name: nginx-plus-ingress
         ports:

diff --git a/deployments/helm-chart/Chart.yaml b/deployments/helm-chart/Chart.yaml
@@ -1,13 +1,13 @@
 name: nginx-ingress
-version: 0.11.0
-appVersion: 2.0.0
+version: 0.11.1
+appVersion: 2.0.1
 apiVersion: v1
 kubeVersion: ">= 1.19.0-0"
 description: NGINX Ingress Controller
-icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v2.0.0/deployments/helm-chart/chart-icon.png
+icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v2.0.1/deployments/helm-chart/chart-icon.png
 home: https://github.com/nginxinc/kubernetes-ingress
 sources:
-  - https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.0/deployments/helm-chart
+  - https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.1/deployments/helm-chart
 keywords:
   - ingress
   - nginx

diff --git a/deployments/helm-chart/README.md b/deployments/helm-chart/README.md
@@ -26,7 +26,7 @@ This step is required if you're installing the chart using its sources. Addition
 2. Change your working directory to /deployments/helm-chart:
     ```console
     $ cd kubernetes-ingress/deployments/helm-chart
-    $ git checkout v2.0.0
+    $ git checkout v2.0.1
     ```
 
 ## Adding the Helm Repository
@@ -152,7 +152,7 @@ Parameter | Description | Default
 `controller.nginxDebug` | Enables debugging for NGINX. Uses the `nginx-debug` binary. Requires `error-log-level: debug` in the ConfigMap via `controller.config.entries`. | false
 `controller.logLevel` | The log level of the Ingress Controller. | 1
 `controller.image.repository` | The image repository of the Ingress controller. | nginx/nginx-ingress
-`controller.image.tag` | The tag of the Ingress controller image. | 2.0.0
+`controller.image.tag` | The tag of the Ingress controller image. | 2.0.1
 `controller.image.pullPolicy` | The pull policy for the Ingress controller image. | IfNotPresent
 `controller.config.name` | The name of the ConfigMap used by the Ingress controller. | Autogenerated
 `controller.config.annotations` | The annotations of the Ingress controller configmap. | {}

diff --git a/deployments/helm-chart/values-icp.yaml b/deployments/helm-chart/values-icp.yaml
@@ -3,7 +3,7 @@ controller:
   nginxplus: true
   image:
     repository: mycluster.icp:8500/kube-system/nginx-plus-ingress
-    tag: "2.0.0"
+    tag: "2.0.1"
   nodeSelector:
     beta.kubernetes.io/arch: "amd64"
     proxy: true

diff --git a/deployments/helm-chart/values-plus.yaml b/deployments/helm-chart/values-plus.yaml
@@ -2,4 +2,4 @@ controller:
   nginxplus: true
   image:
     repository: nginx-plus-ingress
-    tag: "2.0.0"
+    tag: "2.0.1"
diff --git a/deployments/helm-chart/values.yaml b/deployments/helm-chart/values.yaml
@@ -34,7 +34,7 @@ controller:
     repository: nginx/nginx-ingress
 
     ## The tag of the Ingress controller image.
-    tag: "2.0.0"
+    tag: "2.0.1"
 
     ## The pull policy for the Ingress controller image.
     pullPolicy: IfNotPresent

diff --git a/docs/content/app-protect/configuration.md b/docs/content/app-protect/configuration.md
@@ -8,13 +8,13 @@ toc: true
 ---
 
 This document describes how to configure the NGINX App Protect module
-> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.0/examples/appprotect).
+> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.1/examples/appprotect).
 
 ## Global Configuration
 
 The NGINX Ingress Controller has a set of global configuration parameters that align with those available in the NGINX App Protect module. See [ConfigMap keys](/nginx-ingress-controller/configuration/global-configuration/configmap-resource/#modules) for the complete list. The App Protect parameters use the `app-protect*` prefix.
 
-> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.0/examples/appprotect).
+> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.1/examples/appprotect).
 
 ## Enable App Protect for an Ingress Resource
 

diff --git a/docs/content/app-protect/installation.md b/docs/content/app-protect/installation.md
@@ -73,4 +73,4 @@ Take the steps below to set up and deploy the NGINX Ingress Controller and App P
 3. Enable the App Protect module by adding the `enable-app-protect` [cli argument](/nginx-ingress-controller/configuration/global-configuration/command-line-arguments/#cmdoption-enable-app-protect) to your Deployment or DaemonSet file.
 4. [Deploy the Ingress Controller](/nginx-ingress-controller/installation/installation-with-manifests/#3-deploy-the-ingress-controller).
 
-For more information, see the [Configuration guide](/nginx-ingress-controller/app-protect/configuration) and the [NGINX Ingress Controller with App Protect examples on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.0/examples/appprotect).
+For more information, see the [Configuration guide](/nginx-ingress-controller/app-protect/configuration) and the [NGINX Ingress Controller with App Protect examples on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.1/examples/appprotect).
diff --git a/docs/content/configuration/configuration-examples.md b/docs/content/configuration/configuration-examples.md
@@ -9,5 +9,5 @@ toc: true
 
 
 Our [GitHub repo](https://github.com/nginxinc/kubernetes-ingress) includes a number of configuration examples:
-* [*Examples*](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.0/examples) show how to use advanced NGINX features in Ingress resources with annotations.
-* [*Examples of Custom Resources*](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.0/examples-of-custom-resources) show how to use VirtualServer and VirtualServerResources for a few use cases.
+* [*Examples*](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.1/examples) show how to use advanced NGINX features in Ingress resources with annotations.
+* [*Examples of Custom Resources*](https://github.com/nginxinc/kubernetes-ingress/tree/v2.0.1/examples-of-custom-resources) show how to use VirtualServer and VirtualServerResources for a few use cases.