From 8fc326127e5fe80bfb34516d26cb1c2bba225cae Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Thu, 7 Dec 2017 15:16:01 -0700 Subject: [PATCH 1/3] Use 0.9.0 release of nginx-ingress-controller --- addons/ingress-nginx/v1.6.0.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/ingress-nginx/v1.6.0.yaml b/addons/ingress-nginx/v1.6.0.yaml index 1cf9c1b430..0423f54a84 100644 --- a/addons/ingress-nginx/v1.6.0.yaml +++ b/addons/ingress-nginx/v1.6.0.yaml @@ -274,7 +274,7 @@ spec: terminationGracePeriodSeconds: 60 serviceAccountName: nginx-ingress-controller containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0-beta.10 + - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0 name: nginx-ingress-controller imagePullPolicy: Always ports: @@ -309,4 +309,4 @@ spec: - /nginx-ingress-controller - --default-backend-service=$(POD_NAMESPACE)/nginx-default-backend - --configmap=$(POD_NAMESPACE)/ingress-nginx - - --publish-service=$(POD_NAMESPACE)/ingress-nginx \ No newline at end of file + - --publish-service=$(POD_NAMESPACE)/ingress-nginx From dee78fe7a7099ebd434b731e84d5d226c56ab8e9 Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Thu, 7 Dec 2017 15:55:59 -0700 Subject: [PATCH 2/3] Fix 0.9.0 image --- addons/ingress-nginx/v1.6.0.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/ingress-nginx/v1.6.0.yaml b/addons/ingress-nginx/v1.6.0.yaml index 0423f54a84..9ee430b634 100644 --- a/addons/ingress-nginx/v1.6.0.yaml +++ b/addons/ingress-nginx/v1.6.0.yaml @@ -274,7 +274,7 @@ spec: terminationGracePeriodSeconds: 60 serviceAccountName: nginx-ingress-controller containers: - - image: gcr.io/google_containers/nginx-ingress-controller:0.9.0 + - image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0 name: nginx-ingress-controller imagePullPolicy: Always ports: From 2ab5f115b3c1369e5599386d61732bd0f0a22ac2 Mon Sep 17 00:00:00 2001 From: Wes Morgan Date: Wed, 27 Dec 2017 12:21:21 -0500 Subject: [PATCH 3/3] Keep old annotations-prefix for now --- addons/ingress-nginx/v1.6.0.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/ingress-nginx/v1.6.0.yaml b/addons/ingress-nginx/v1.6.0.yaml index 9ee430b634..614a1dc883 100644 --- a/addons/ingress-nginx/v1.6.0.yaml +++ b/addons/ingress-nginx/v1.6.0.yaml @@ -310,3 +310,4 @@ spec: - --default-backend-service=$(POD_NAMESPACE)/nginx-default-backend - --configmap=$(POD_NAMESPACE)/ingress-nginx - --publish-service=$(POD_NAMESPACE)/ingress-nginx + - --annotations-prefix=ingress.kubernetes.io