rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-09-09 17:08:53 +00:00
Code Issues Releases Wiki Activity

Revert "Bump up nginx ingress controller version"

Browse Source 
This reverts commit af3ac12812.
This commit is contained in:
Alena Prokharchyk
2018-07-20 13:31:33 -07:00
committed by Denise
parent 979e30e942
commit 556fa1f61d
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apis/management.cattle.io/v3/k8s_defaults.go
View File

@@ -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"),
},
}