Release 1.2.0

pleshakov · pleshakov · commit 43e537d210c4 · 2018-05-01T17:41:20.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,34 @@
 # Changelog
 
+### 1.2.0
+
+* [279](https://github.com/nginxinc/kubernetes-ingress/pull/279): Update dependencies.
+* [278](https://github.com/nginxinc/kubernetes-ingress/pull/278): Fix mergeable Ingress types.
+* [277](https://github.com/nginxinc/kubernetes-ingress/pull/277): Support grpc error responses.
+* [276](https://github.com/nginxinc/kubernetes-ingress/pull/276): Add gRPC support.
+* [274](https://github.com/nginxinc/kubernetes-ingress/pull/274): Change the default load balancing method to least_conn. 
+* [272](https://github.com/nginxinc/kubernetes-ingress/pull/272): Move nginx-ingress image to the official nginx DockerHub.
+* [268](https://github.com/nginxinc/kubernetes-ingress/pull/268): Correct Mergeable Types misspelling and optimize blacklists. Thanks to [Fernando Diaz](https://github.com/diazjf). 
+* [266](https://github.com/nginxinc/kubernetes-ingress/pull/266): Add support for passive health checks.
+* [261](https://github.com/nginxinc/kubernetes-ingress/pull/261): Update Customization Example.
+* [258](https://github.com/nginxinc/kubernetes-ingress/pull/258): Handle annotations and conflicting paths for MergeableTypes. Thanks to [Fernando Diaz](https://github.com/diazjf).
+* [256](https://github.com/nginxinc/kubernetes-ingress/pull/256): Add helm chart support. 
+* [249](https://github.com/nginxinc/kubernetes-ingress/pull/249): Add support for prometheus for Plus.
+* [241](https://github.com/nginxinc/kubernetes-ingress/pull/241): Update the doc about building the Docker image.
+* [240](https://github.com/nginxinc/kubernetes-ingress/pull/240): Use new NGINX Plus API.
+* [239](https://github.com/nginxinc/kubernetes-ingress/pull/239): Fix a typo in a variable name. Thanks to [Tony Li](https://github.com/mysterytony).
+* [238](https://github.com/nginxinc/kubernetes-ingress/pull/238): Remove apt-get upgrade from Plus Dockerfile.
+* [237](https://github.com/nginxinc/kubernetes-ingress/pull/237): Add unit test for ingress-class handling.
+* [236](https://github.com/nginxinc/kubernetes-ingress/pull/236): Always respect `-ingress-class` option. Thanks to [Nick Novitski](https://github.com/nicknovitski).
+* [235](https://github.com/nginxinc/kubernetes-ingress/pull/235): Change the base image to Debian Stretch for Plus controller.
+* [234](https://github.com/nginxinc/kubernetes-ingress/pull/234): Update installation manifests and instructions.
+* [233](https://github.com/nginxinc/kubernetes-ingress/pull/233): Add docker build options to Makefile.
+* [231](https://github.com/nginxinc/kubernetes-ingress/pull/231): Prevent a possible failure of building Plus image.
+* Documentation Fixes: [248](https://github.com/nginxinc/kubernetes-ingress/pull/248), thanks to [zariye](https://github.com/zariye). [252](https://github.com/nginxinc/kubernetes-ingress/pull/252). [270](https://github.com/nginxinc/kubernetes-ingress/pull/270).
+* Update NGINX version to 1.13.12.
+* Update NGINX Plus version to R15 P1.
+
+
 ### 1.1.1
 
 * [228](https://github.com/nginxinc/kubernetes-ingress/pull/228): Add worker-rlimit-nofile configmap key. Thanks to [Aleksandr Lysenko](https://github.com/Sarga).
diff --git 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.1.1
+      - image: nginx/nginx-ingress:1.2.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
@@ -15,7 +15,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx-plus-ingress:1.0.0
+      - image: nginx-plus-ingress:1.2.0
         # imagePullPolicy: Always
         name: nginx-plus-ingress
         ports:
diff --git a/helm-chart/README.md b/helm-chart/README.md
@@ -50,7 +50,7 @@ Parameter | Description | Default
 `controller.nginxplus` | Should NGINX Plus be deployed. | false
 `controller.hostNetwork` | If the nginx deployment / daemonset should run on 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.1.1
+`controller.image.tag` | The tag of the Ingress controller image. | 1.2.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 TLS certificate for the default HTTPS server. | None
diff --git 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.1.1"
+    tag: "1.2.0"
     pullPolicy: IfNotPresent
   defaultTLS:
     cert:
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
@@ -5,7 +5,7 @@ controller:
   hostNetwork: "false"
   image:
     repository: nginx/nginx-ingress
-    tag: "1.1.1"
+    tag: "1.2.0"
     pullPolicy: IfNotPresent
   config:
     entries: {}
diff --git 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.1.1
+      - image: nginx/nginx-ingress:1.2.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
@@ -17,7 +17,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx-plus-ingress:1.1.1
+      - image: nginx-plus-ingress:1.2.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
@@ -14,7 +14,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx-plus-ingress:1.1.1
+      - image: nginx-plus-ingress:1.2.0
         name: nginx-plus-ingress
         ports:
         - name: http
diff --git 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.1.1
+      - image: nginx/nginx-ingress:1.2.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
@@ -18,7 +18,7 @@ spec:
     spec:
       serviceAccountName: nginx-ingress
       containers:
-      - image: nginx-plus-ingress:1.1.1
+      - image: nginx-plus-ingress:1.2.0
         name: nginx-plus-ingress
         ports:
         - name: http
diff --git 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.1.1
+      - image: nginx-plus-ingress:1.2.0
         name: nginx-plus-ingress
         ports:
         - name: http
diff --git a/nginx-controller/Makefile b/nginx-controller/Makefile
@@ -1,6 +1,6 @@
 all: push
 
-VERSION = 1.1.1
+VERSION = 1.2.0
 TAG = $(VERSION)
 PREFIX = nginx/nginx-ingress
 
diff --git 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.1.1** is built and pushed to the registry. Note that the tag `1.1.1` comes from the `VERSION` variable, defined in the Makefile.
+      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.
 
     * 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.1.1** is built and pushed to the registry. Note that the tag `1.1.1` comes from the `VERSION` variable, defined in the Makefile.
+      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.
 
 Next you will find the details about available Makefile targets and variables.
 
