From b8acd634bc7b781c6dd287ab5c8d85880190fa35 Mon Sep 17 00:00:00 2001 From: Michael Pleshakov Date: Wed, 8 Aug 2018 16:24:42 +0100 Subject: [PATCH] Release 1.3.0 --- CHANGELOG.md | 29 +++++++++++++++++++ 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 +- .../nginx-plus-ingress-with-prometheus.yaml | 2 +- install/daemon-set/nginx-plus-ingress.yaml | 2 +- install/deployment/nginx-ingress.yaml | 2 +- .../nginx-plus-ingress-with-prometheus.yaml | 2 +- install/deployment/nginx-plus-ingress.yaml | 2 +- nginx-controller/Makefile | 4 +-- nginx-controller/README.md | 4 +-- 16 files changed, 46 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa9d30b1be..6ff394f396 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,34 @@ # Changelog +### 1.3.0 + +IMPROVEMENTS: +* [325](https://github.com/nginxinc/kubernetes-ingress/pull/325): Report ingress status. +* [311](https://github.com/nginxinc/kubernetes-ingress/pull/311): Support JWT auth in mergeable minions. +* [310](https://github.com/nginxinc/kubernetes-ingress/pull/310): NGINX configuration template custom path support. +* [308](https://github.com/nginxinc/kubernetes-ingress/pull/308): Add prometheus exporter support to helm chart. +* [303](https://github.com/nginxinc/kubernetes-ingress/pull/303): Add fetch custom NGINX template from ConfigMap. +* [301](https://github.com/nginxinc/kubernetes-ingress/pull/301): Update prometheus exporter image for Plus. +* [298](https://github.com/nginxinc/kubernetes-ingress/pull/298): Prefetch ConfigMap before initial NGINX Config generation. +* [296](https://github.com/nginxinc/kubernetes-ingress/pull/296): Improve Helm Chart. +* [295](https://github.com/nginxinc/kubernetes-ingress/pull/295): Report version information. +* [294](https://github.com/nginxinc/kubernetes-ingress/pull/294): Support dynamic reconfiguration in mergeable ingresses for Plus. +* [287](https://github.com/nginxinc/kubernetes-ingress/pull/287): Support slow-start for Plus. +* [286](https://github.com/nginxinc/kubernetes-ingress/pull/286): Add support for active health checks for Plus. + +CHANGES: +* [330](https://github.com/nginxinc/kubernetes-ingress/pull/330): Update NGINX version to 1.15.2. +* [329](https://github.com/nginxinc/kubernetes-ingress/pull/329): Enforce annotations inheritance in minions. + +BUGFIXES: +* [326](https://github.com/nginxinc/kubernetes-ingress/pull/326): Fix find ingress for secret ns bug. +* [284](https://github.com/nginxinc/kubernetes-ingress/pull/284): Correct Logs for Mergeable Types with Duplicate Location. Thanks to [Fernando Diaz](https://github.com/diazjf). + + +UPGRADE: +* For NGINX, use the 1.3.0 image from our DockerHub: `nginx/nginx-ingress:1.3.0` +* For NGINX Plus, please build your own image using the 1.3.0 source code. + ### 1.2.0 * [279](https://github.com/nginxinc/kubernetes-ingress/pull/279): Update dependencies. diff --git a/examples/openshift/nginx-ingress-rc.yaml b/examples/openshift/nginx-ingress-rc.yaml index 5530dcb48e..6bbf2b6796 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.2.0 + - image: nginx/nginx-ingress:1.3.0 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 444130b090..284bf1478a 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.2.0 + - image: nginx-plus-ingress:1.3.0 # imagePullPolicy: Always name: nginx-plus-ingress ports: diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml index 91dad809b6..ab60e62c58 100644 --- a/helm-chart/Chart.yaml +++ b/helm-chart/Chart.yaml @@ -1,6 +1,6 @@ name: nginx-ingress version: 0.1.1 -appVersion: 1.2.0 +appVersion: 1.3.0 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 abbc114fcd..9cfcb1f97f 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.2.0 +`controller.image.tag` | The tag of the Ingress controller image. | 1.3.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 --git a/helm-chart/values-icp.yaml b/helm-chart/values-icp.yaml index 23a868b82e..246be844c1 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.2.0" + tag: "1.3.0" 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 86b20690fa..de94f4e57f 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.2.0" + tag: "1.3.0" 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 06be5c064d..145eedb7eb 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.2.0" + tag: "1.3.0" pullPolicy: IfNotPresent config: entries: {} diff --git a/install/daemon-set/nginx-ingress.yaml b/install/daemon-set/nginx-ingress.yaml index 9b1e69e449..1bf0075f8e 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.2.0 + - image: nginx/nginx-ingress:1.3.0 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 4fa40d1d02..2f91ad6fe8 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.2.0 + - image: nginx-plus-ingress:1.3.0 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 3595f8dd16..a1bdde4c9b 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.2.0 + - image: nginx-plus-ingress:1.3.0 name: nginx-plus-ingress ports: - name: http diff --git a/install/deployment/nginx-ingress.yaml b/install/deployment/nginx-ingress.yaml index b1d5dc3f42..031ccc0f15 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.2.0 + - image: nginx/nginx-ingress:1.3.0 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 134c2e11d1..9bc5f2b677 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.2.0 + - image: nginx-plus-ingress:1.3.0 name: nginx-plus-ingress ports: - name: http diff --git a/install/deployment/nginx-plus-ingress.yaml b/install/deployment/nginx-plus-ingress.yaml index 2e5ee36a42..f277c5acb8 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.2.0 + - image: nginx-plus-ingress:1.3.0 name: nginx-plus-ingress ports: - name: http diff --git a/nginx-controller/Makefile b/nginx-controller/Makefile index 21a4eb58e8..2210919018 100644 --- a/nginx-controller/Makefile +++ b/nginx-controller/Makefile @@ -1,11 +1,11 @@ all: push -VERSION = 1.2.0 +VERSION = 1.3.0 TAG = $(VERSION) PREFIX = nginx/nginx-ingress DOCKER_RUN = docker run --rm -v $(shell pwd)/../:/go/src/github.com/nginxinc/kubernetes-ingress -w /go/src/github.com/nginxinc/kubernetes-ingress/nginx-controller/ -GOLANG_CONTAINER = golang:1.9 +GOLANG_CONTAINER = golang:1.10 DOCKERFILE = Dockerfile BUILD_IN_CONTAINER = 1 diff --git a/nginx-controller/README.md b/nginx-controller/README.md index 41cebd6179..7eac042453 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.2.0** is built and pushed to the registry. Note that the tag `1.2.0` comes from the `VERSION` variable, defined in the Makefile. + 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. * 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.2.0** is built and pushed to the registry. Note that the tag `1.2.0` comes from the `VERSION` variable, defined in the Makefile. + 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. Next you will find the details about available Makefile targets and variables.