Auto stash before merge of "master" and "master/master" (#1982)

Release nginx ingress controller 0.10.2
kubernetes · Jan 25, 2018 · fd7253a · fd7253a
1 parent 444a56c
commit fd7253a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 7 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,13 @@
 # Changelog
 
+### 0.10.2
+
+**Image:**  `quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.2`
+
+*Changes:*
+
+- [X] [#1978](https://github.com/kubernetes/ingress-nginx/pull/1978) Fix chain completion and default certificate flag issues
+
 ### 0.10.1
 
 **Image:**  `quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.1`

diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ all: all-container
 BUILDTAGS=
 
 # Use the 0.0 tag for testing, it shouldn't clobber any release builds
-TAG?=0.10.1
+TAG?=0.10.2
 REGISTRY?=quay.io/kubernetes-ingress-controller
 GOOS?=linux
 DOCKER?=gcloud docker --

diff --git a/deploy/provider/patch-service-with-rbac.yaml b/deploy/provider/patch-service-with-rbac.yaml
@@ -16,7 +16,7 @@ spec:
       serviceAccountName: nginx-ingress-serviceaccount   
       containers:
         - name: nginx-ingress-controller
-          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.1
+          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.2
           args:
             - /nginx-ingress-controller
             - --default-backend-service=$(POD_NAMESPACE)/default-http-backend

diff --git a/deploy/provider/patch-service-without-rbac.yaml b/deploy/provider/patch-service-without-rbac.yaml
@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: nginx-ingress-controller
-          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.1
+          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.2
           args:
             - /nginx-ingress-controller
             - --default-backend-service=$(POD_NAMESPACE)/default-http-backend

diff --git a/deploy/with-rbac.yaml b/deploy/with-rbac.yaml
@@ -29,7 +29,7 @@ spec:
           privileged: true
       containers:
         - name: nginx-ingress-controller
-          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.1
+          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.2
           args:
             - /nginx-ingress-controller
             - --default-backend-service=$(POD_NAMESPACE)/default-http-backend

diff --git a/deploy/without-rbac.yaml b/deploy/without-rbac.yaml
@@ -28,7 +28,7 @@ spec:
           privileged: true
       containers:
         - name: nginx-ingress-controller
-          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.1
+          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.2
           args:
             - /nginx-ingress-controller
             - --default-backend-service=$(POD_NAMESPACE)/default-http-backend

diff --git a/docs/examples/customization/custom-errors/rc-custom-errors.yaml b/docs/examples/customization/custom-errors/rc-custom-errors.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60
       containers:
-      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.1
+      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.2
         name: nginx-ingress-lb
         imagePullPolicy: Always
         readinessProbe:

diff --git a/docs/examples/static-ip/nginx-ingress-controller.yaml b/docs/examples/static-ip/nginx-ingress-controller.yaml
@@ -18,7 +18,7 @@ spec:
       # hostNetwork: true
       terminationGracePeriodSeconds: 60
       containers:
-      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.1
+      - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.10.2
         name: nginx-ingress-controller
         readinessProbe:
           httpGet: