Release 1.4.0

Author: pleshakov

Diff for: CHANGELOG.md

@@ -1,5 +1,66 @@
 # Changelog
 
+### 1.4.0
+
+FEATURES:
+* [401](https://github.com/nginxinc/kubernetes-ingress/pull/401): Add the `-nginx-debug` flag for enabling debugging of NGINX using the `nginx-debug` binary.
+* [387](https://github.com/nginxinc/kubernetes-ingress/pull/387): Add the `-nginx-status-allow-cidrs` command-line argument for white listing IPv4 IP/CIDR blocks to allow access to NGINX stub_status or the NGINX Plus API. Thanks to [Jasmine Hegman](https://github.com/r4j4h).
+* [376](https://github.com/nginxinc/kubernetes-ingress/pull/376): Support the [random](http://nginx.org/en/docs/http/ngx_http_upstream_module.html#random) load balancing method.
+* [375](https://github.com/nginxinc/kubernetes-ingress/pull/375): Support custom annotations.
+* [346](https://github.com/nginxinc/kubernetes-ingress/pull/346): Support the Prometheus exporter for NGINX (the stub_status metrics).
+* [344](https://github.com/nginxinc/kubernetes-ingress/pull/344): Expose NGINX Plus API/NGINX stub_status on a custom port via the `-nginx-status-port` command-line argument. See also the CHANGES section.
+* [342](https://github.com/nginxinc/kubernetes-ingress/pull/342): Add the `error-log-level` configmap key. Thanks to [boran seref](https://github.com/boranx).
+* [320](https://github.com/nginxinc/kubernetes-ingress/pull/340): Support TCP/UDP load balancing via the `stream-snippets` configmap key.
+
+
+IMPROVEMENTS:
+* [434](https://github.com/nginxinc/kubernetes-ingress/pull/434): Improve consistency of templates.
+* [432](https://github.com/nginxinc/kubernetes-ingress/pull/432): Fix cli-docs and Improve main test.
+* [419](https://github.com/nginxinc/kubernetes-ingress/pull/419): Refactor config writing. Thanks to [feifeiiiiiiiiii](https://github.com/feifeiiiiiiiiiii).
+* [403](https://github.com/nginxinc/kubernetes-ingress/pull/403): Improve NGINX start.
+* [400](https://github.com/nginxinc/kubernetes-ingress/pull/400): Fix error message in internal/controller/controller.go. Thanks to [Alex O Regan](https://github.com/aaaaaaaalex).
+* [399](https://github.com/nginxinc/kubernetes-ingress/pull/399): Improve secret handling. See also the CHANGES section.
+* [391](https://github.com/nginxinc/kubernetes-ingress/pull/391): Update default lb-method to be random two least_conn. See also the CHANGES section.
+* [389](https://github.com/nginxinc/kubernetes-ingress/pull/389): Improve parsing nginx.org/rewrites annotation.
+* [380](https://github.com/nginxinc/kubernetes-ingress/pull/380): Verify reloads & cache secrets.
+* [362](https://github.com/nginxinc/kubernetes-ingress/pull/362): Reduce reloads.
+* [357](https://github.com/nginxinc/kubernetes-ingress/pull/357): Improve Project Layout and Refactor Controller Package. See also the CHANGES section.
+* [351](https://github.com/nginxinc/kubernetes-ingress/pull/351): Make socket address obvious.
+
+BUGFIXES:
+* [429](https://github.com/nginxinc/kubernetes-ingress/pull/429): Fix panic with health checks.
+* [386](https://github.com/nginxinc/kubernetes-ingress/pull/386): Fix Configmap/Mergeable Ingress Add/Update event logging.
+* [379](https://github.com/nginxinc/kubernetes-ingress/pull/379): Fix configmap update.
+* [365](https://github.com/nginxinc/kubernetes-ingress/pull/365): Don't enqueue ingress for some service changes.
+* [348](https://github.com/nginxinc/kubernetes-ingress/pull/348): Fix Configurator error check.
+
+HELM CHART:
+* [430](https://github.com/nginxinc/kubernetes-ingress/pull/430): Add the `controller.serviceAccount.imagePullSecrets` parameter to the helm chart. See also the CHANGES section.
+* [420](https://github.com/nginxinc/kubernetes-ingress/pull/420): Simplify values files for Helm Chart.
+* [398](https://github.com/nginxinc/kubernetes-ingress/pull/398): Add the `controller.nginxStatus.allowCidrs` and `controller.service.externalIPs` parameters to helm chart.
+* [393](https://github.com/nginxinc/kubernetes-ingress/pull/393): Refactor Helm Chart templates.
+* [390](https://github.com/nginxinc/kubernetes-ingress/pull/390): Add the `controller.service.loadBalancerIP` parameter to the helm chat.
+* [377](https://github.com/nginxinc/kubernetes-ingress/pull/377): Add the `controller.nginxStatus` parameters to the helm chart.
+* [335](https://github.com/nginxinc/kubernetes-ingress/pull/335): Add the `controller.reportIngressStatus` parameters to the helm chart.
+* The version of the Helm chart is now 0.2.0.
+
+CHANGES:
+* Update NGINX version to 1.15.6.   
+* Update NGINX Plus version to R16p1.
+* Update NGINX Prometheus Exporter to 0.2.0.
+* [430](https://github.com/nginxinc/kubernetes-ingress/pull/430): Add the `controller.serviceAccount.imagePullSecrets` parameter to the helm chart. **Note**: the `controller.serviceAccountName` parameter has been changed to `controller.serviceAccount.name`.
+* [399](https://github.com/nginxinc/kubernetes-ingress/pull/399): Improve secret handling. **Note**: the PR changed how the Ingress Controller processes Ingress resources with TLS termination enabled but without any referenced (or with invalid) secrets and Ingress resources with JWT validation enabled but without any referenced (or with invalid) JWK. Please read [here](https://github.com/nginxinc/kubernetes-ingress/pull/399) for more details.
+* [357](https://github.com/nginxinc/kubernetes-ingress/pull/357): Improve Project Layout and Refactor Controller Package. **Note**: the PR significantly changed the layout of the project to follow best practices.
+* [347](https://github.com/nginxinc/kubernetes-ingress/pull/347): Use edge version in manifests and Helm chart. **Note**: the manifests and the helm chart in the master branch now reference the edge version of the Ingress Controller instead of the latest stable version used previously.
+* [391](https://github.com/nginxinc/kubernetes-ingress/pull/391): Update default lb-method to be random two least_conn. **Note**: the default load balancing method is now the power of two choices as it better suits the Ingress Controller use case. Please read the [blog post](https://www.nginx.com/blog/nginx-power-of-two-choices-load-balancing-algorithm/) about the method for more details.
+* [344](https://github.com/nginxinc/kubernetes-ingress/pull/344): Expose NGINX Plus API/NGINX stub_status on a custom port via the `-nginx-status-port` command-line argument. **Note**: For NGINX the stub_status is now exposed on port 8080 at the /stub_status URL by default. Previously, the stub_status was not exposed on any port. The stub_status can be disabled via the `-nginx-status` flag.
+
+DOC AND EXAMPLES FIXES/IMPROVEMENTS: [435](https://github.com/nginxinc/kubernetes-ingress/pull/435), [433](https://github.com/nginxinc/kubernetes-ingress/pull/433), [432](https://github.com/nginxinc/kubernetes-ingress/pull/432), [418](https://github.com/nginxinc/kubernetes-ingress/pull/418) (Thanks to [Hal Deadman](https://github.com/hdeadman)), [406](https://github.com/nginxinc/kubernetes-ingress/pull/406),  [381](https://github.com/nginxinc/kubernetes-ingress/pull/381), [349](https://github.com/nginxinc/kubernetes-ingress/pull/349) (Thanks to [Artur Geraschenko](https://github.com/arturgspb)), [343](https://github.com/nginxinc/kubernetes-ingress/pull/343)
+
+UPGRADE:
+* For NGINX, use the 1.4.0 image from our DockerHub: `nginx/nginx-ingress:1.4.0` or `nginx/nginx-ingress:1.4.0-alpine`
+* For NGINX Plus, please build your own image using the 1.4.0 source code.
+
 ### 1.3.2
 
 CHANGES:

Diff for: Makefile

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

Diff for: README.md

@@ -45,7 +45,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.3.2](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.3.2). 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.4.0](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.4.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.
@@ -58,7 +58,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.3.2`, `nginx/nginx-ingress:1.3.2-alpine` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/) or [build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/v1.3.2/nginx-controller). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/v1.3.2/nginx-controller). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v1.3.2/install). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v1.3.2/helm-chart). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/v1.3.2/docs). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/v1.3.2/examples). |
+| Latest stable release | For production use | `nginx/nginx-ingress:1.4.0`, `nginx/nginx-ingress:1.4.0-alpine` from [DockerHub](https://hub.docker.com/r/nginx/nginx-ingress/) or [build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.0/build). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.0/build). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.0/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.0/deployments/helm-chart). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.0/docs). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.0/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/build). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/master/build). | [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). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/master/examples). |
 
 ## Contacts

Diff for: build/README.md

@@ -30,6 +30,7 @@ We build the image using the make utility and the provided `Makefile`. Let’s c
 1. Clone the Ingress controller repo:
     ```
     $ git clone https://github.com/nginxinc/kubernetes-ingress/
+    $ git checkout v1.4.0
     ```
 
 1. Build the image:
@@ -40,7 +41,7 @@ We build the image using the make utility and the provided `Makefile`. Let’s c
       ```
       `myregistry.example.com/nginx-ingress` defines the repo in your private registry where the image will be pushed. Substitute that value with the repo in your private registry.
       
-      As the result, the image **myregistry.example.com/nginx-ingress:edge** is built and pushed to the registry. Note that the tag `edge` comes from the `VERSION` variable, defined in the Makefile.
+      As the result, the image **myregistry.example.com/nginx-ingress:1.4.0** is built and pushed to the registry. Note that the tag `1.4.0` comes from the `VERSION` variable, defined in the Makefile.
 
     * For NGINX Plus, first, make sure that the certificate (`nginx-repo.crt`) and the key (`nginx-repo.key`) of your license are located in the root of the project:
       ```
@@ -54,7 +55,7 @@ We build the image using the make utility and the provided `Makefile`. Let’s c
       ```
       `myregistry.example.com/nginx-plus-ingress` defines the repo in your private registry where the image will be pushed. Substitute that value with the repo in your private registry.
       
-      As the result, the image **myregistry.example.com/nginx-plus-ingress:edge** is built and pushed to the registry. Note that the tag `edge` comes from the `VERSION` variable, defined in the Makefile.
+      As the result, the image **myregistry.example.com/nginx-plus-ingress:1.4.0** is built and pushed to the registry. Note that the tag `1.4.0` comes from the `VERSION` variable, defined in the Makefile.
 
 Next you will find the details about available Makefile targets and variables.
 

Diff for: deployments/daemon-set/nginx-ingress-with-prometheus.yaml

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

Diff for: deployments/daemon-set/nginx-ingress.yaml

@@ -14,8 +14,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx/nginx-ingress:edge
-        imagePullPolicy: Always
+      - image: nginx/nginx-ingress:1.4.0
         name: nginx-ingress
         ports:
         - name: http

Diff for: deployments/daemon-set/nginx-plus-ingress-with-prometheus.yaml

@@ -17,8 +17,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx-plus-ingress:edge
-        imagePullPolicy: Always
+      - image: nginx-plus-ingress:1.4.0
         name: nginx-plus-ingress
         ports:
         - name: http

Diff for: deployments/daemon-set/nginx-plus-ingress.yaml

@@ -14,8 +14,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx-plus-ingress:edge
-        imagePullPolicy: Always
+      - image: nginx-plus-ingress:1.4.0
         name: nginx-plus-ingress
         ports:
         - name: http

Diff for: deployments/deployment/nginx-ingress-with-prometheus.yaml

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

Diff for: deployments/deployment/nginx-ingress.yaml

@@ -15,8 +15,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx/nginx-ingress:edge
-        imagePullPolicy: Always
+      - image: nginx/nginx-ingress:1.4.0
         name: nginx-ingress
         ports:
         - name: http

Diff for: deployments/deployment/nginx-plus-ingress-with-prometheus.yaml

@@ -18,8 +18,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx-plus-ingress:edge
-        imagePullPolicy: Always
+      - image: nginx-plus-ingress:1.4.0
         name: nginx-plus-ingress
         ports:
         - name: http

Diff for: deployments/deployment/nginx-plus-ingress.yaml

@@ -15,8 +15,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx-plus-ingress:edge
-        imagePullPolicy: Always
+      - image: nginx-plus-ingress:1.4.0
         name: nginx-plus-ingress
         ports:
         - name: http

Diff for: deployments/helm-chart/Chart.yaml

@@ -1,6 +1,6 @@
 name: nginx-ingress
 version: 0.2.0
-appVersion: edge
+appVersion: 1.4.0
 description: NGINX Ingress Controller
 sources:
   - https://github.com/nginxinc/kubernetes-ingress/tree/master/deployment/helm-chart

Diff for: deployments/helm-chart/README.md

@@ -18,6 +18,7 @@ This chart deploys the NGINX Ingress controller in your Kubernetes cluster.
 1. Clone the Ingress controller repo:
     ```
     $ git clone https://github.com/nginxinc/kubernetes-ingress/
+    $ git checkout v1.4.0
     ```
 2. Change your working directory to /deployments/helm-chart:
     ```
@@ -63,7 +64,7 @@ Parameter | Description | Default
 `controller.hostNetwork` | Enables the Ingress controller pods to use the host's network namespace. | false
 `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.image.repository` | The image repository of the Ingress controller. | nginx/nginx-ingress
-`controller.image.tag` | The tag of the Ingress controller image. | edge
+`controller.image.tag` | The tag of the Ingress controller image. | 1.4.0
 `controller.image.pullPolicy` | The pull policy for the Ingress controller image. | IfNotPresent
 `controller.config.entries` | The entries of the ConfigMap for customizing NGINX configuration. | { }
 `controller.defaultTLS.cert` | The base64-encoded TLS certificate for the default HTTPS server. If not specified, a pre-generated self-signed certificate is used. **Note:** It is recommended that you specify your own certificate. | A pre-generated self-signed certificate.

Diff for: deployments/helm-chart/values-icp.yaml

@@ -3,7 +3,7 @@ controller:
   nginxplus: true
   image:
     repository: mycluster.icp:8500/kube-system/nginx-plus-ingress
-    tag: "edge"
+    tag: "1.4.0"
   nodeSelector: { beta.kubernetes.io/arch: "amd64",
                    proxy: "true" }
   terminationGracePeriodSeconds: 60

Diff for: deployments/helm-chart/values-plus.yaml

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

Diff for: deployments/helm-chart/values.yaml

@@ -6,7 +6,7 @@ controller:
   nginxDebug: false
   image:
     repository: nginx/nginx-ingress
-    tag: "edge"
+    tag: "1.4.0"
     pullPolicy: IfNotPresent
   config:
     entries: {}

Diff for: examples/openshift/nginx-ingress-rc.yaml

@@ -15,8 +15,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx/nginx-ingress:edge
-        imagePullPolicy: Always
+      - image: nginx/nginx-ingress:1.4.0
         name: nginx-ingress
         ports:
         - containerPort: 80

Diff for: examples/openshift/nginx-plus-ingress-rc.yaml

@@ -15,8 +15,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx-plus-ingress:edge
-        imagePullPolicy: Always
+      - image: nginx-plus-ingress:1.4.0
         name: nginx-plus-ingress
         ports:
         - containerPort: 80