From 556fa1f61dfa7fb20b449a0fadf8d45e341acb9b Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Fri, 20 Jul 2018 13:31:33 -0700 Subject: [PATCH] Revert "Bump up nginx ingress controller version" This reverts commit af3ac12812bf04fa3ad318974912a489c02872d0. --- apis/management.cattle.io/v3/k8s_defaults.go | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 32ceddba..817aa1fc 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -33,7 +33,7 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), - Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, @@ -59,7 +59,7 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), - Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, @@ -85,7 +85,7 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), - Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, @@ -111,7 +111,7 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), - Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, @@ -137,7 +137,7 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), - Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, @@ -163,7 +163,7 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), - Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, @@ -189,7 +189,7 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), - Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, @@ -215,7 +215,7 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), - Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, @@ -293,7 +293,7 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), - Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, @@ -369,7 +369,7 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), - Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), }, "v1.8.11-rancher1": { @@ -394,7 +394,7 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), - Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), }, "v1.8.11-rancher2-1": { @@ -419,7 +419,7 @@ var ( WeaveNode: m("weaveworks/weave-kube:2.1.2"), WeaveCNI: m("weaveworks/weave-npc:2.1.2"), PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.0"), - Ingress: m("rancher/nginx-ingress-controller:0.16.2-rancher1"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher2"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), }, }