From f89a9a22d730ed294730489e4d14b4b4baf82647 Mon Sep 17 00:00:00 2001 From: Michael Pleshakov Date: Tue, 30 Oct 2018 15:30:44 +0000 Subject: [PATCH] Release 1.3.1 --- CHANGELOG.md | 9 +++++++++ examples/openshift/nginx-ingress-rc.yaml | 2 +- examples/openshift/nginx-plus-ingress-rc.yaml | 2 +- helm-chart/Chart.yaml | 2 +- helm-chart/README.md | 2 +- helm-chart/values-icp.yaml | 2 +- helm-chart/values-plus.yaml | 2 +- helm-chart/values.yaml | 2 +- install/daemon-set/nginx-ingress.yaml | 2 +- .../daemon-set/nginx-plus-ingress-with-prometheus.yaml | 2 +- install/daemon-set/nginx-plus-ingress.yaml | 2 +- install/deployment/nginx-ingress.yaml | 2 +- .../deployment/nginx-plus-ingress-with-prometheus.yaml | 2 +- install/deployment/nginx-plus-ingress.yaml | 2 +- nginx-controller/Makefile | 2 +- nginx-controller/README.md | 4 ++-- 16 files changed, 25 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ff394f3969..6599933c398 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,14 @@ # Changelog +### 1.3.1 + +CHANGES: +* Update NGINX Plus version to R15p2. + +UPGRADE: +* For NGINX, use the 1.3.1 image from our DockerHub: `nginx/nginx-ingress:1.3.1` or `nginx/nginx-ingress:1.3.1-alpine` +* For NGINX Plus, please build your own image using the 1.3.1 source code. + ### 1.3.0 IMPROVEMENTS: diff --git a/examples/openshift/nginx-ingress-rc.yaml b/examples/openshift/nginx-ingress-rc.yaml index 6bbf2b6796b..df88d9f25b4 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.3.0 + - image: nginx/nginx-ingress:1.3.1 imagePullPolicy: Always name: nginx-ingress ports: diff --git a/examples/openshift/nginx-plus-ingress-rc.yaml b/examples/openshift/nginx-plus-ingress-rc.yaml index 284bf1478a1..b972a7dc5ca 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.3.0 + - image: nginx-plus-ingress:1.3.1 # imagePullPolicy: Always name: nginx-plus-ingress ports: diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml index ab60e62c58a..596cb92e457 100644 --- a/helm-chart/Chart.yaml +++ b/helm-chart/Chart.yaml @@ -1,6 +1,6 @@ name: nginx-ingress version: 0.1.1 -appVersion: 1.3.0 +appVersion: 1.3.1 description: NGINX Ingress Controller sources: - https://github.com/nginxinc/kubernetes-ingress/tree/master/helm-chart diff --git a/helm-chart/README.md b/helm-chart/README.md index 9cfcb1f97f9..32b83b42213 100644 --- a/helm-chart/README.md +++ b/helm-chart/README.md @@ -62,7 +62,7 @@ Parameter | Description | Default `controller.nginxplus` | Deploys the Ingress controller for NGINX Plus. | false `controller.hostNetwork` | Enables the Ingress controller pods to use the host's network namespace. | 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.3.0 +`controller.image.tag` | The tag of the Ingress controller image. | 1.3.1 `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/helm-chart/values-icp.yaml b/helm-chart/values-icp.yaml index 246be844c11..d6bc9b4c23a 100644 --- a/helm-chart/values-icp.yaml +++ b/helm-chart/values-icp.yaml @@ -5,7 +5,7 @@ controller: hostNetwork: false image: repository: mycluster.icp:8500/kube-system/nginx-plus-ingress - tag: "1.3.0" + tag: "1.3.1" pullPolicy: IfNotPresent # It is recommended to use your own TLS certificate and key defaultTLS: diff --git a/helm-chart/values-plus.yaml b/helm-chart/values-plus.yaml index de94f4e57f5..a577efc8427 100644 --- a/helm-chart/values-plus.yaml +++ b/helm-chart/values-plus.yaml @@ -5,7 +5,7 @@ controller: hostNetwork: false image: repository: nginx-plus-ingress - tag: "1.3.0" + tag: "1.3.1" pullPolicy: IfNotPresent # It is recommended to use your own TLS certificate and key defaultTLS: diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 145eedb7eb8..e4a35abb0c7 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -5,7 +5,7 @@ controller: hostNetwork: false image: repository: nginx/nginx-ingress - tag: "1.3.0" + tag: "1.3.1" pullPolicy: IfNotPresent config: entries: {} diff --git a/install/daemon-set/nginx-ingress.yaml b/install/daemon-set/nginx-ingress.yaml index 1bf0075f8ee..42d36d419b7 100644 --- a/install/daemon-set/nginx-ingress.yaml +++ b/install/daemon-set/nginx-ingress.yaml @@ -14,7 +14,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx/nginx-ingress:1.3.0 + - image: nginx/nginx-ingress:1.3.1 name: nginx-ingress ports: - name: http diff --git a/install/daemon-set/nginx-plus-ingress-with-prometheus.yaml b/install/daemon-set/nginx-plus-ingress-with-prometheus.yaml index 2f91ad6fe86..38134505a61 100644 --- a/install/daemon-set/nginx-plus-ingress-with-prometheus.yaml +++ b/install/daemon-set/nginx-plus-ingress-with-prometheus.yaml @@ -17,7 +17,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx-plus-ingress:1.3.0 + - image: nginx-plus-ingress:1.3.1 name: nginx-plus-ingress ports: - name: http diff --git a/install/daemon-set/nginx-plus-ingress.yaml b/install/daemon-set/nginx-plus-ingress.yaml index a1bdde4c9b3..77b925ec333 100644 --- a/install/daemon-set/nginx-plus-ingress.yaml +++ b/install/daemon-set/nginx-plus-ingress.yaml @@ -14,7 +14,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx-plus-ingress:1.3.0 + - image: nginx-plus-ingress:1.3.1 name: nginx-plus-ingress ports: - name: http diff --git a/install/deployment/nginx-ingress.yaml b/install/deployment/nginx-ingress.yaml index 031ccc0f151..8c2e063bfc5 100644 --- a/install/deployment/nginx-ingress.yaml +++ b/install/deployment/nginx-ingress.yaml @@ -15,7 +15,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx/nginx-ingress:1.3.0 + - image: nginx/nginx-ingress:1.3.1 name: nginx-ingress ports: - name: http diff --git a/install/deployment/nginx-plus-ingress-with-prometheus.yaml b/install/deployment/nginx-plus-ingress-with-prometheus.yaml index 9bc5f2b6771..f9400a7bf40 100644 --- a/install/deployment/nginx-plus-ingress-with-prometheus.yaml +++ b/install/deployment/nginx-plus-ingress-with-prometheus.yaml @@ -18,7 +18,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx-plus-ingress:1.3.0 + - image: nginx-plus-ingress:1.3.1 name: nginx-plus-ingress ports: - name: http diff --git a/install/deployment/nginx-plus-ingress.yaml b/install/deployment/nginx-plus-ingress.yaml index f277c5acb81..52f296f3291 100644 --- a/install/deployment/nginx-plus-ingress.yaml +++ b/install/deployment/nginx-plus-ingress.yaml @@ -15,7 +15,7 @@ spec: spec: serviceAccountName: nginx-ingress containers: - - image: nginx-plus-ingress:1.3.0 + - image: nginx-plus-ingress:1.3.1 name: nginx-plus-ingress ports: - name: http diff --git a/nginx-controller/Makefile b/nginx-controller/Makefile index 22109190182..a43397f3ffc 100644 --- a/nginx-controller/Makefile +++ b/nginx-controller/Makefile @@ -1,6 +1,6 @@ all: push -VERSION = 1.3.0 +VERSION = 1.3.1 TAG = $(VERSION) PREFIX = nginx/nginx-ingress diff --git a/nginx-controller/README.md b/nginx-controller/README.md index 7eac0424534..b69db7e7971 100644 --- a/nginx-controller/README.md +++ b/nginx-controller/README.md @@ -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.3.0** is built and pushed to the registry. Note that the tag `1.3.0` comes from the `VERSION` variable, defined in the Makefile. + As the result, the image **myregistry.example.com/nginx-ingress:1.3.1** is built and pushed to the registry. Note that the tag `1.3.1` 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 `nginx-controller` folder: ``` @@ -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.3.0** is built and pushed to the registry. Note that the tag `1.3.0` comes from the `VERSION` variable, defined in the Makefile. + As the result, the image **myregistry.example.com/nginx-plus-ingress:1.3.1** is built and pushed to the registry. Note that the tag `1.3.1` comes from the `VERSION` variable, defined in the Makefile. Next you will find the details about available Makefile targets and variables.