Release 1.12.0 (#1695)

nginxinc · Jun 30, 2021 · c9d3618 · c9d3618
1 parent a182910
commit c9d3618
Show file tree

Hide file tree

Showing 31 changed files with 146 additions and 92 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -120,23 +120,6 @@ jobs:
             NGINX_VERSION=${{ steps.commit.outputs.nginx_version }}
             DATE=${{ steps.commit.outputs.date }}
             GIT_COMMIT=${{ github.sha }}
-      - name: Run Trivy vulnerability scanner
-        uses: aquasecurity/trivy-action@master
-        with:
-          image-ref: '${{ matrix.image }}:${{ github.sha }}'
-          format: 'template'
-          template: '@/contrib/sarif.tpl'
-          output: 'trivy-results-${{ matrix.image }}.sarif'
-          ignore-unfixed: 'true'
-      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: 'trivy-results-${{ matrix.image }}.sarif'
-      - name: Upload Scan Results
-        uses: actions/upload-artifact@v2
-        with:
-          name: 'trivy-results-${{ matrix.image }}.sarif'
-          path: 'trivy-results-${{ matrix.image }}.sarif'
 
   package-helm:
     name: Package Helm Chart

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+### 1.12.0
+
+An automatically generated list of changes can be found on Github at: [1.12.0 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.12.0)
+
+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.11.3
 
 An automatically generated list of changes can be found on Github at: [1.11.3 Release](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.11.3)

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ Read [this doc](docs/nginx-plus.md) to learn more about NGINX Ingress controller
 
 We publish Ingress controller releases on GitHub. See our [releases page](https://github.com/nginxinc/kubernetes-ingress/releases).
 
-The latest stable release is [1.11.3](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.11.3). 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 [1.12.0](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.12.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.
 
 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:1.11.3`, `nginx/nginx-ingress:1.11.3-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/). | [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v1.11.3/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v1.11.3/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:1.12.0`, `nginx/nginx-ingress:1.12.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/). | [Build your own image](https://docs.nginx.com/nginx-ingress-controller/installation/building-ingress-controller-image/). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.0/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.0/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-web/installation/building-ingress-controller-image.md). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/master/docs-web/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-web). [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:1.11.3
+      - image: nginx/nginx-ingress:1.12.0
         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:1.11.3
+      - image: nginx-plus-ingress:1.12.0
         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:1.11.3
+      - image: nginx/nginx-ingress:1.12.0
         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:1.11.3
+      - image: nginx-plus-ingress:1.12.0
         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.9.3
-appVersion: 1.11.3
+version: 0.10.0
+appVersion: 1.12.0
 apiVersion: v1
 kubeVersion: ">= 1.16.0-0"
 description: NGINX Ingress Controller
-icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v1.11.3/deployments/helm-chart/chart-icon.png
+icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v1.12.0/deployments/helm-chart/chart-icon.png
 home: https://github.com/nginxinc/kubernetes-ingress
 sources:
-  - https://github.com/nginxinc/kubernetes-ingress/tree/v1.11.3/deployments/helm-chart
+  - https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.0/deployments/helm-chart
 keywords:
   - ingress
   - nginx

diff --git a/deployments/helm-chart/README.md b/deployments/helm-chart/README.md
@@ -24,7 +24,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 v1.11.3
+    $ git checkout v1.12.0
     ```
 
 ## 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. | 1.11.3
+`controller.image.tag` | The tag of the Ingress controller image. | 1.12.0
 `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: "1.11.3"
+    tag: "1.12.0"
   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: "1.11.3"
+    tag: "1.12.0"
diff --git a/deployments/helm-chart/values.yaml b/deployments/helm-chart/values.yaml
@@ -36,7 +36,7 @@ controller:
     repository: nginx/nginx-ingress
 
     ## The tag of the Ingress controller image.
-    tag: "1.11.3"
+    tag: "1.12.0"
 
     ## The pull policy for the Ingress controller image.
     pullPolicy: IfNotPresent

diff --git a/docs-web/app-protect/configuration.md b/docs-web/app-protect/configuration.md
@@ -1,12 +1,12 @@
 # Configuration
 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/v1.11.3/examples/appprotect).
+> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.0/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/v1.11.3/examples/appprotect).
+> Check out the complete [NGINX Ingress Controller with App Protect example resources on GitHub](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.0/examples/appprotect).
 
 ## Enable App Protect for an Ingress Resource
 

diff --git a/docs-web/app-protect/installation.md b/docs-web/app-protect/installation.md
@@ -39,4 +39,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/#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/v1.11.3/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/v1.12.0/examples/appprotect).
diff --git a/docs-web/configuration/configuration-examples.md b/docs-web/configuration/configuration-examples.md
@@ -1,5 +1,5 @@
 # Configuration Examples
 
 Our [GitHub repo](https://github.com/nginxinc/kubernetes-ingress) includes a number of configuration examples:
-* [*Examples*](https://github.com/nginxinc/kubernetes-ingress/tree/v1.11.3/examples) show how to use advanced NGINX features in Ingress resources with annotations.
-* [*Examples of Custom Resources*](https://github.com/nginxinc/kubernetes-ingress/tree/v1.11.3/examples-of-custom-resources) show how to use VirtualServer and VirtualServerResources for a few use cases.
+* [*Examples*](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.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/v1.12.0/examples-of-custom-resources) show how to use VirtualServer and VirtualServerResources for a few use cases.
diff --git a/docs-web/configuration/global-configuration/configmap-resource.md b/docs-web/configuration/global-configuration/configmap-resource.md
@@ -153,19 +153,19 @@ See the doc about [VirtualServer and VirtualServerRoute resources](/nginx-ingres
    * - ``resolver-addresses``
      - Sets the value of the `resolver <https://nginx.org/en/docs/http/ngx_http_core_module.html#resolver>`_ addresses. Note: If you use a DNS name (ex., ``kube-dns.kube-system.svc.cluster.local``\ ) as a resolver address, NGINX Plus will resolve it using the system resolver during the start and on every configuration reload. As a consequence, If the name cannot be resolved or the DNS server doesn't respond, NGINX Plus will fail to start or reload. To avoid this, consider using only IP addresses as resolver addresses. Supported in NGINX Plus only.
      - N/A
-     - `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.11.3/examples/externalname-services>`_.
+     - `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.0/examples/externalname-services>`_.
    * - ``resolver-ipv6``
      - Enables IPv6 resolution in the resolver. Supported in NGINX Plus only.
      - ``True``
-     - `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.11.3/examples/externalname-services>`_.
+     - `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.0/examples/externalname-services>`_.
    * - ``resolver-valid``
      - Sets the time NGINX caches the resolved DNS records. Supported in NGINX Plus only.
      - TTL value of a DNS record
-     - `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.11.3/examples/externalname-services>`_.
+     - `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.0/examples/externalname-services>`_.
    * - ``resolver-timeout``
      - Sets the `resolver_timeout <https://nginx.org/en/docs/http/ngx_http_core_module.html#resolver_timeout>`_ for name resolution. Supported in NGINX Plus only.
      - ``30s``
-     - `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.11.3/examples/externalname-services>`_.
+     - `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.0/examples/externalname-services>`_.
    * - ``keepalive-timeout``
      - Sets the value of the `keepalive_timeout <https://nginx.org/en/docs/http/ngx_http_core_module.html#keepalive_timeout>`_ directive.
      - ``65s``
@@ -208,15 +208,15 @@ See the doc about [VirtualServer and VirtualServerRoute resources](/nginx-ingres
      -
    * - ``log-format``
      - Sets the custom `log format <https://nginx.org/en/docs/http/ngx_http_log_module.html#log_format>`_ for HTTP and HTTPS traffic. For convenience, it is possible to define the log format across multiple lines (each line separated by ``\n``). In that case, the Ingress Controller will replace every ``\n`` character with a space character. All ``'`` characters must be escaped.
-     - See the `template file <https://github.com/nginxinc/kubernetes-ingress/blob/v1.11.3/internal/configs/version1/nginx.tmpl>`_ for the access log.
-     - `Custom Log Format <https://github.com/nginxinc/kubernetes-ingress/tree/v1.11.3/examples/custom-log-format>`_.
+     - See the `template file <https://github.com/nginxinc/kubernetes-ingress/blob/v1.12.0/internal/configs/version1/nginx.tmpl>`_ for the access log.
+     - `Custom Log Format <https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.0/examples/custom-log-format>`_.
    * - ``log-format-escaping``
      - Sets the characters escaping for the variables of the log format. Supported values: ``json`` (JSON escaping), ``default`` (the default escaping) ``none`` (disables escaping).
      - ``default``
      -
    * - ``stream-log-format``
      - Sets the custom `log format <https://nginx.org/en/docs/stream/ngx_stream_log_module.html#log_format>`_ for TCP, UDP, and TLS Passthrough traffic. For convenience, it is possible to define the log format across multiple lines (each line separated by ``\n``). In that case, the Ingress Controller will replace every ``\n`` character with a space character. All ``'`` characters must be escaped.
-     - See the `template file <https://github.com/nginxinc/kubernetes-ingress/blob/v1.11.3/internal/configs/version1/nginx.tmpl>`_.
+     - See the `template file <https://github.com/nginxinc/kubernetes-ingress/blob/v1.12.0/internal/configs/version1/nginx.tmpl>`_.
      -
    * - ``stream-log-format-escaping``
      - Sets the characters escaping for the variables of the stream log format. Supported values: ``json`` (JSON escaping), ``default`` (the default escaping) ``none`` (disables escaping).
@@ -313,7 +313,7 @@ See the doc about [VirtualServer and VirtualServerRoute resources](/nginx-ingres
    * - ``proxy-protocol``
      - Enables PROXY Protocol for incoming connections.
      - ``False``
-     - `Proxy Protocol <https://github.com/nginxinc/kubernetes-ingress/tree/v1.11.3/examples/proxy-protocol>`_.
+     - `Proxy Protocol <https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.0/examples/proxy-protocol>`_.
 ```
 
 ### Backend Services (Upstreams)
@@ -377,7 +377,7 @@ See the doc about [VirtualServer and VirtualServerRoute resources](/nginx-ingres
    * - ``stream-snippets``
      - Sets a custom snippet in stream context.
      - N/A
-     - `Support for TCP/UDP Load Balancing <https://github.com/nginxinc/kubernetes-ingress/tree/v1.11.3/examples/tcp-udp>`_.
+     - `Support for TCP/UDP Load Balancing <https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.0/examples/tcp-udp>`_.
    * - ``main-template``
      - Sets the main NGINX configuration template.
      - By default the template is read from the file in the container.

diff --git a/docs-web/configuration/global-configuration/custom-templates.md b/docs-web/configuration/global-configuration/custom-templates.md
@@ -1,3 +1,3 @@
 # Custom Templates
 
-The Ingress Controller uses templates to generate NGINX configuration for Ingress resources, VirtualServer resources and the main NGINX configuration file. You can customize the templates and apply them via the ConfigMap. See the [corresponding example](https://github.com/nginxinc/kubernetes-ingress/tree/v1.11.3/examples/custom-templates).
+The Ingress Controller uses templates to generate NGINX configuration for Ingress resources, VirtualServer resources and the main NGINX configuration file. You can customize the templates and apply them via the ConfigMap. See the [corresponding example](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.0/examples/custom-templates).
diff --git a/docs-web/configuration/handling-host-and-listener-collisions.md b/docs-web/configuration/handling-host-and-listener-collisions.md
@@ -72,7 +72,7 @@ Similarly, if `cafe-ingress` was created first, it will win `cafe.example.com` a
 
 It is possible to merge configuration for multiple Ingress resources for the same host. One common use case for this approach is distributing resources across multiple namespaces. See the [Cross-namespace Configuration](/nginx-ingress-controller/configuration/ingress-resources/cross-namespace-configuration/) doc for more information.
 
-It is *not* possible to merge the configurations for multiple VirtualServer resources for the same host. However, you can split the VirtualServers into multiple VirtualServerRoute resources, which a single VirtualServer can then reference. See the [corresponding example](https://github.com/nginxinc/kubernetes-ingress/tree/v1.11.3/examples-of-custom-resources/cross-namespace-configuration) on GitHub.
+It is *not* possible to merge the configurations for multiple VirtualServer resources for the same host. However, you can split the VirtualServers into multiple VirtualServerRoute resources, which a single VirtualServer can then reference. See the [corresponding example](https://github.com/nginxinc/kubernetes-ingress/tree/v1.12.0/examples-of-custom-resources/cross-namespace-configuration) on GitHub.
 
 It is *not* possible to merge configuration for multiple TransportServer resources.