Release 1.6.1

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+### 1.6.1
+
+CHANGES:
+* Update NGINX version to 1.17.7.
+
+HELM CHART:
+* The version of the Helm chart is now 0.4.1.
+
+UPGRADE:
+* For NGINX, use the 1.6.1 image from our DockerHub: `nginx/nginx-ingress:1.6.1` or `nginx/nginx-ingress:1.6.1-alpine`
+* For NGINX Plus, please build your own image using the 1.6.1 source code.
+* For Helm, use version 0.4.1 of the chart.
+
 ### 1.6.0
 
 OVERVIEW:

Makefile

@@ -1,6 +1,6 @@
 all: push
 
-VERSION = 1.6.0
+VERSION = 1.6.1
 TAG = $(VERSION)
 PREFIX = nginx/nginx-ingress
 

README.md

@@ -49,7 +49,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.6.0](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.6.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 [1.6.1](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.6.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.
@@ -62,7 +62,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.6.0`, `nginx/nginx-ingress:1.6.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.6.0/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v1.6.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:1.6.1`, `nginx/nginx-ingress:1.6.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/). | [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.6.1/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v1.6.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-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

deployments/daemon-set/nginx-ingress.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx/nginx-ingress:1.6.0
+      - image: nginx/nginx-ingress:1.6.1
         name: nginx-ingress
         ports:
         - name: http

deployments/daemon-set/nginx-plus-ingress.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx-plus-ingress:1.6.0
+      - image: nginx-plus-ingress:1.6.1
         name: nginx-plus-ingress
         ports:
         - name: http

deployments/deployment/nginx-ingress.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx/nginx-ingress:1.6.0
+      - image: nginx/nginx-ingress:1.6.1
         name: nginx-ingress
         ports:
         - name: http

deployments/deployment/nginx-plus-ingress.yaml

@@ -18,7 +18,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx-plus-ingress:1.6.0
+      - image: nginx-plus-ingress:1.6.1
         name: nginx-plus-ingress
         ports:
         - name: http

deployments/helm-chart/Chart.yaml

@@ -1,11 +1,11 @@
 name: nginx-ingress
-version: 0.4.0 
-appVersion: 1.6.0
+version: 0.4.1 
+appVersion: 1.6.1
 apiVersion: v1
 description: NGINX Ingress Controller
-icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v1.6.0/deployments/helm-chart/chart-icon.png
+icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/v1.6.1/deployments/helm-chart/chart-icon.png
 sources:
-  - https://github.com/nginxinc/kubernetes-ingress/tree/v1.6.0/deployments/helm-chart
+  - https://github.com/nginxinc/kubernetes-ingress/tree/v1.6.1/deployments/helm-chart
 keywords:
   - ingress
   - nginx

deployments/helm-chart/README.md

@@ -54,7 +54,7 @@ This chart deploys the NGINX Ingress controller in your Kubernetes cluster.
 1. Clone the Ingress controller repo:
     ```console
     $ git clone https://github.com/nginxinc/kubernetes-ingress/
-    $ git checkout v1.6.0
+    $ git checkout v1.6.1
     ```
 2. Change your working directory to /deployments/helm-chart:
     ```console
@@ -123,7 +123,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.6.0
+`controller.image.tag` | The tag of the Ingress controller image. | 1.6.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.entries` | The entries of the ConfigMap for customizing NGINX configuration. | {}

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.6.0"
+    tag: "1.6.1"
   nodeSelector:
     beta.kubernetes.io/arch: "amd64"
     proxy: true

deployments/helm-chart/values-plus.yaml

@@ -2,4 +2,4 @@ controller:
   nginxplus: true
   image:
     repository: nginx-plus-ingress
-    tag: "1.6.0"
+    tag: "1.6.1"

deployments/helm-chart/values.yaml

@@ -26,7 +26,7 @@ controller:
     repository: nginx/nginx-ingress
 
     ## The tag of the Ingress controller image.
-    tag: "1.6.0"
+    tag: "1.6.1"
 
     ## The pull policy for the Ingress controller image.
     pullPolicy: IfNotPresent

docs-web/configuration/configuration-examples.md

@@ -1,5 +1,5 @@
 # Configuration Examples
 
 Out [GitHub repo](https://github.com/nginxinc/kubernetes-ingress) includes as number of configuration examples:
-* [*Examples*](https://github.com/nginxinc/kubernetes-ingress/tree/v1.6.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.6.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/v1.6.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/v1.6.1/examples-of-custom-resources) show how to use VirtualServer and VirtualServerResources for a few use cases.

docs-web/configuration/global-configuration/configmap-resource.md

@@ -149,19 +149,19 @@ See the doc about [VirtualServer and VirtualServerRoute resources](/nginx-ingres
    * - ``resolver-addresses``
      - Sets the value of the `resolver <http://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.6.0/examples/externalname-services>`_.
+     - `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.6.1/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.6.0/examples/externalname-services>`_.
+     - `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.6.1/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.6.0/examples/externalname-services>`_.
+     - `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.6.1/examples/externalname-services>`_.
    * - ``resolver-timeout``
      - Sets the `resolver_timeout <http://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.6.0/examples/externalname-services>`_.
+     - `Support for Type ExternalName Services <https://github.com/nginxinc/kubernetes-ingress/tree/v1.6.1/examples/externalname-services>`_.
    * - ``keepalive-timeout``
      - Sets the value of the `keepalive_timeout <http://nginx.org/en/docs/http/ngx_http_core_module.html#keepalive_timeout>`_ directive.
      - ``65s``
@@ -200,11 +200,11 @@ See the doc about [VirtualServer and VirtualServerRoute resources](/nginx-ingres
      - 
    * - ``log-format``
      - Sets the custom `log format <http://nginx.org/en/docs/http/ngx_http_log_module.html#log_format>`_.
-     - See the `template file <https://github.com/nginxinc/kubernetes-ingress/blob/v1.6.0/internal/configs/version1/nginx.tmpl>`_ for the access log.
+     - See the `template file <https://github.com/nginxinc/kubernetes-ingress/blob/v1.6.1/internal/configs/version1/nginx.tmpl>`_ for the access log.
      - 
    * - ``stream-log-format``
      - Sets the custom `log format <http://nginx.org/en/docs/stream/ngx_stream_log_module.html#log_format>`_ for TCP/UDP load balancing.
-     - See the `template file <https://github.com/nginxinc/kubernetes-ingress/blob/v1.6.0/internal/configs/version1/nginx.tmpl>`_.
+     - See the `template file <https://github.com/nginxinc/kubernetes-ingress/blob/v1.6.1/internal/configs/version1/nginx.tmpl>`_.
      - 
 ```
 
@@ -297,7 +297,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.6.0/examples/proxy-protocol>`_.
+     - `Proxy Protocol <https://github.com/nginxinc/kubernetes-ingress/tree/v1.6.1/examples/proxy-protocol>`_.
 ```
 
 ### Backend Services (Upstreams)
@@ -361,7 +361,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.6.0/examples/tcp-udp>`_.
+     - `Support for  TCP/UDP Load Balancing <https://github.com/nginxinc/kubernetes-ingress/tree/v1.6.1/examples/tcp-udp>`_.
    * - ``main-template``
      - Sets the main NGINX configuration template.
      - By default the template is read from the file in the container.
@@ -385,13 +385,13 @@ See the doc about [VirtualServer and VirtualServerRoute resources](/nginx-ingres
    * - ``opentracing``
      - Enables `OpenTracing <https://opentracing.io>`_ globally (for all Ingress, VirtualServer and VirtualServerRoute resources). Note: requires the Ingress Controller image with OpenTracing module and a tracer. See the `docs </nginx-ingress-controller/third-party-modules/opentracing>`_ for more information.
      - ``False``
-     - `Support for OpenTracing <https://github.com/nginxinc/kubernetes-ingress/blob/v1.6.0/examples/opentracing/README.md>`_.
+     - `Support for OpenTracing <https://github.com/nginxinc/kubernetes-ingress/blob/v1.6.1/examples/opentracing/README.md>`_.
    * - ``opentracing-tracer``
      - Sets the path to the vendor tracer binary plugin.
      - N/A
-     - `Support for OpenTracing <https://github.com/nginxinc/kubernetes-ingress/blob/v1.6.0/examples/opentracing/README.md>`_.
+     - `Support for OpenTracing <https://github.com/nginxinc/kubernetes-ingress/blob/v1.6.1/examples/opentracing/README.md>`_.
    * - ``opentracing-tracer-config``
      - Sets the tracer configuration in JSON format.
      - N/A
-     - `Support for OpenTracing <https://github.com/nginxinc/kubernetes-ingress/blob/v1.6.0/examples/opentracing/README.md>`_.
+     - `Support for OpenTracing <https://github.com/nginxinc/kubernetes-ingress/blob/v1.6.1/examples/opentracing/README.md>`_.
 ```

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 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.6.0/examples/custom-templates).
+The Ingress Controller uses templates to generate NGINX configuration for Ingress 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.6.1/examples/custom-templates).