From 88d36171fa16e1a4348a97ac6db420fbb76d45a0 Mon Sep 17 00:00:00 2001 From: Michael Pleshakov Date: Wed, 2 Jan 2019 20:46:07 +0300 Subject: [PATCH] Release 1.4.3 --- CHANGELOG.md | 9 +++++++++ Makefile | 2 +- README.md | 4 ++-- build/README.md | 6 +++--- .../daemon-set/nginx-ingress-with-prometheus.yaml | 2 +- deployments/daemon-set/nginx-ingress.yaml | 2 +- .../daemon-set/nginx-plus-ingress-with-prometheus.yaml | 2 +- deployments/daemon-set/nginx-plus-ingress.yaml | 2 +- .../deployment/nginx-ingress-with-prometheus.yaml | 2 +- deployments/deployment/nginx-ingress.yaml | 2 +- .../deployment/nginx-plus-ingress-with-prometheus.yaml | 2 +- deployments/deployment/nginx-plus-ingress.yaml | 2 +- deployments/helm-chart/Chart.yaml | 2 +- deployments/helm-chart/README.md | 4 ++-- deployments/helm-chart/values-icp.yaml | 2 +- deployments/helm-chart/values-plus.yaml | 2 +- deployments/helm-chart/values.yaml | 2 +- examples/openshift/nginx-ingress-rc.yaml | 2 +- examples/openshift/nginx-plus-ingress-rc.yaml | 2 +- 19 files changed, 31 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 456e4c21fe..561356f0b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +### 1.4.3 + +CHANGES: +* Update NGINX version to 1.15.8. + +UPGRADE: +* For NGINX, use the 1.4.3 image from our DockerHub: `nginx/nginx-ingress:1.4.3` or `nginx/nginx-ingress:1.4.3-alpine` +* For NGINX Plus, please build your own image using the 1.4.3 source code. + ### 1.4.2 CHANGES: diff --git a/Makefile b/Makefile index 5aa8dfe98a..e99ad2dbd0 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ all: push -VERSION = 1.4.2 +VERSION = 1.4.3 TAG = $(VERSION) PREFIX = nginx/nginx-ingress diff --git a/README.md b/README.md index 4565892762..6fb544d23b 100644 --- a/README.md +++ b/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.4.2](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.4.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.3](https://github.com/nginxinc/kubernetes-ingress/releases/tag/v1.4.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. 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.4.2`, `nginx/nginx-ingress:1.4.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.4.2/build). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.2/build). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.2/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.2/deployments/helm-chart). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.2/docs). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.2/examples). | +| Latest stable release | For production use | `nginx/nginx-ingress:1.4.3`, `nginx/nginx-ingress:1.4.3-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.3/build). | [Build your own image](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.3/build). | [Manifests](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.3/deployments). [Helm chart](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.3/deployments/helm-chart). | [Documentation](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.3/docs). [Examples](https://github.com/nginxinc/kubernetes-ingress/tree/v1.4.3/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 --git a/build/README.md b/build/README.md index 94a0fdea6d..d3d3de360b 100644 --- a/build/README.md +++ b/build/README.md @@ -30,7 +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.2 + $ git checkout v1.4.3 ``` 1. Build the image: @@ -41,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:1.4.2** is built and pushed to the registry. Note that the tag `1.4.2` comes from the `VERSION` variable, defined in the Makefile. + As the result, the image **myregistry.example.com/nginx-ingress:1.4.3** is built and pushed to the registry. Note that the tag `1.4.3` 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: ``` @@ -55,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:1.4.2** is built and pushed to the registry. Note that the tag `1.4.2` comes from the `VERSION` variable, defined in the Makefile. + As the result, the image **myregistry.example.com/nginx-plus-ingress:1.4.3** is built and pushed to the registry. Note that the tag `1.4.3` comes from the `VERSION` variable, defined in the Makefile. Next you will find the details about available Makefile targets and variables. diff --git a/deployments/daemon-set/nginx-ingress-with-prometheus.yaml b/deployments/daemon-set/nginx-ingress-with-prometheus.yaml index 64bf368f97..8760adb53b 100644 --- a/deployments/daemon-set/nginx-ingress-with-prometheus.yaml +++ b/deployments/daemon-set/nginx-ingress-with-prometheus.yaml @@ -17,7 +17,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx/nginx-ingress:1.4.2 + - image: nginx/nginx-ingress:1.4.3 name: nginx-ingress ports: - name: http diff --git a/deployments/daemon-set/nginx-ingress.yaml b/deployments/daemon-set/nginx-ingress.yaml index 4d226ce51c..1b4291be3b 100644 --- a/deployments/daemon-set/nginx-ingress.yaml +++ b/deployments/daemon-set/nginx-ingress.yaml @@ -14,7 +14,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx/nginx-ingress:1.4.2 + - image: nginx/nginx-ingress:1.4.3 name: nginx-ingress ports: - name: http diff --git a/deployments/daemon-set/nginx-plus-ingress-with-prometheus.yaml b/deployments/daemon-set/nginx-plus-ingress-with-prometheus.yaml index 4bb424d7f9..c75af2a902 100644 --- a/deployments/daemon-set/nginx-plus-ingress-with-prometheus.yaml +++ b/deployments/daemon-set/nginx-plus-ingress-with-prometheus.yaml @@ -17,7 +17,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx-plus-ingress:1.4.2 + - image: nginx-plus-ingress:1.4.3 name: nginx-plus-ingress ports: - name: http diff --git a/deployments/daemon-set/nginx-plus-ingress.yaml b/deployments/daemon-set/nginx-plus-ingress.yaml index 018547efa4..d3c9be2f2b 100644 --- a/deployments/daemon-set/nginx-plus-ingress.yaml +++ b/deployments/daemon-set/nginx-plus-ingress.yaml @@ -14,7 +14,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx-plus-ingress:1.4.2 + - image: nginx-plus-ingress:1.4.3 name: nginx-plus-ingress ports: - name: http diff --git a/deployments/deployment/nginx-ingress-with-prometheus.yaml b/deployments/deployment/nginx-ingress-with-prometheus.yaml index 4d3cb7c2db..559df6ab7a 100644 --- a/deployments/deployment/nginx-ingress-with-prometheus.yaml +++ b/deployments/deployment/nginx-ingress-with-prometheus.yaml @@ -18,7 +18,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx/nginx-ingress:1.4.2 + - image: nginx/nginx-ingress:1.4.3 name: nginx-ingress ports: - name: http diff --git a/deployments/deployment/nginx-ingress.yaml b/deployments/deployment/nginx-ingress.yaml index 0995524514..da216fcd67 100644 --- a/deployments/deployment/nginx-ingress.yaml +++ b/deployments/deployment/nginx-ingress.yaml @@ -15,7 +15,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx/nginx-ingress:1.4.2 + - image: nginx/nginx-ingress:1.4.3 name: nginx-ingress ports: - name: http diff --git a/deployments/deployment/nginx-plus-ingress-with-prometheus.yaml b/deployments/deployment/nginx-plus-ingress-with-prometheus.yaml index 4ab694f48f..612d1c4c2a 100644 --- a/deployments/deployment/nginx-plus-ingress-with-prometheus.yaml +++ b/deployments/deployment/nginx-plus-ingress-with-prometheus.yaml @@ -18,7 +18,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx-plus-ingress:1.4.2 + - image: nginx-plus-ingress:1.4.3 name: nginx-plus-ingress ports: - name: http diff --git a/deployments/deployment/nginx-plus-ingress.yaml b/deployments/deployment/nginx-plus-ingress.yaml index 67c49100a9..51231df57e 100644 --- a/deployments/deployment/nginx-plus-ingress.yaml +++ b/deployments/deployment/nginx-plus-ingress.yaml @@ -15,7 +15,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx-plus-ingress:1.4.2 + - image: nginx-plus-ingress:1.4.3 name: nginx-plus-ingress ports: - name: http diff --git a/deployments/helm-chart/Chart.yaml b/deployments/helm-chart/Chart.yaml index 853a611646..20cc4e7564 100644 --- a/deployments/helm-chart/Chart.yaml +++ b/deployments/helm-chart/Chart.yaml @@ -1,6 +1,6 @@ name: nginx-ingress version: 0.2.0 -appVersion: 1.4.2 +appVersion: 1.4.3 description: NGINX Ingress Controller sources: - https://github.com/nginxinc/kubernetes-ingress/tree/master/deployment/helm-chart diff --git a/deployments/helm-chart/README.md b/deployments/helm-chart/README.md index 0fd63d713f..25004b7c2b 100644 --- a/deployments/helm-chart/README.md +++ b/deployments/helm-chart/README.md @@ -18,7 +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.2 + $ git checkout v1.4.3 ``` 2. Change your working directory to /deployments/helm-chart: ``` @@ -64,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. | 1.4.2 +`controller.image.tag` | The tag of the Ingress controller image. | 1.4.3 `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 --git a/deployments/helm-chart/values-icp.yaml b/deployments/helm-chart/values-icp.yaml index 8e0a0eb446..83f0170b3b 100644 --- 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.4.2" + tag: "1.4.3" nodeSelector: { beta.kubernetes.io/arch: "amd64", proxy: "true" } terminationGracePeriodSeconds: 60 diff --git a/deployments/helm-chart/values-plus.yaml b/deployments/helm-chart/values-plus.yaml index 2db3c1c7a5..9e7e3731a5 100644 --- 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.4.2" + tag: "1.4.3" diff --git a/deployments/helm-chart/values.yaml b/deployments/helm-chart/values.yaml index 92e82dba1a..f609a233a1 100644 --- a/deployments/helm-chart/values.yaml +++ b/deployments/helm-chart/values.yaml @@ -6,7 +6,7 @@ controller: nginxDebug: false image: repository: nginx/nginx-ingress - tag: "1.4.2" + tag: "1.4.3" pullPolicy: IfNotPresent config: entries: {} diff --git a/examples/openshift/nginx-ingress-rc.yaml b/examples/openshift/nginx-ingress-rc.yaml index 010a56713c..ff2e331ecd 100644 --- a/examples/openshift/nginx-ingress-rc.yaml +++ b/examples/openshift/nginx-ingress-rc.yaml @@ -15,7 +15,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx/nginx-ingress:1.4.2 + - image: nginx/nginx-ingress:1.4.3 name: nginx-ingress ports: - containerPort: 80 diff --git a/examples/openshift/nginx-plus-ingress-rc.yaml b/examples/openshift/nginx-plus-ingress-rc.yaml index ad8631c62a..8aac8b4f73 100644 --- a/examples/openshift/nginx-plus-ingress-rc.yaml +++ b/examples/openshift/nginx-plus-ingress-rc.yaml @@ -15,7 +15,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx-plus-ingress:1.4.2 + - image: nginx-plus-ingress:1.4.3 name: nginx-plus-ingress ports: - containerPort: 80