From a5b307b12f0a16bbd6f6fe9fdc05bf295e08e96f Mon Sep 17 00:00:00 2001 From: kinarashah Date: Wed, 27 May 2020 22:02:55 -0700 Subject: [PATCH] update cni images for v1.15.12-rancher1-1 remove 1.13.12-rancher2-2, 1.14.10-rancher1-2 --- apis/management.cattle.io/v3/k8s_defaults.go | 75 +++----------------- 1 file changed, 8 insertions(+), 67 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 5195c90e..5366f550 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -27,8 +27,8 @@ var ( // When add a new k8s version to 2.2, make sure to add support for it to the 2.1.x branch. // Account for the fact that rke-tools image is different cross branches, and it requires using // different k8s version tag - "v1.13.12-rancher2-2", - "v1.14.10-rancher1-2", + "v1.13.12-rancher1-1", + "v1.14.10-rancher1-0", "v1.15.12-rancher1-1", } @@ -1308,35 +1308,6 @@ var ( CoreDNS: m("coredns/coredns:1.2.6"), CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), }, - // Enabled in Rancher v2.2.13 - "v1.13.12-rancher2-2": { - Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"), - Kubernetes: m("rancher/hyperkube:v1.13.12-rancher2"), - Alpine: m("rancher/rke-tools:v0.1.50"), - NginxProxy: m("rancher/rke-tools:v0.1.50"), - CertDownloader: m("rancher/rke-tools:v0.1.50"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.50"), - KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"), - DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"), - KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"), - KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), - Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"), - FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher6"), - CalicoNode: m("quay.io/calico/node:v3.4.0"), - CalicoCNI: m("quay.io/calico/cni:v3.4.0"), - CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), - CanalNode: m("quay.io/calico/node:v3.4.0"), - CanalCNI: m("quay.io/calico/cni:v3.4.0"), - CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"), - WeaveNode: m("weaveworks/weave-kube:2.5.0"), - WeaveCNI: m("weaveworks/weave-npc:2.5.0"), - PodInfraContainer: m("gcr.io/google_containers/pause:3.1"), - Ingress: m("rancher/nginx-ingress-controller:nginx-0.32.0-rancher1"), - IngressBackend: m("k8s.gcr.io/defaultbackend:1.4-rancher1"), - MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"), - CoreDNS: m("coredns/coredns:1.2.6"), - CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.0.0"), - }, // Enabled in Rancher v2.2.9 "v1.13.12-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24-rancher1"), @@ -1599,36 +1570,6 @@ var ( CoreDNS: m("coredns/coredns:1.3.1"), CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"), }, - // Enabled in Rancher v2.2.13 - "v1.14.10-rancher1-2": { - Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"), - Kubernetes: m("rancher/hyperkube:v1.14.10-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.52"), - NginxProxy: m("rancher/rke-tools:v0.1.52"), - CertDownloader: m("rancher/rke-tools:v0.1.52"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.52"), - KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns:1.15.0"), - DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"), - KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"), - KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"), - Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"), - FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher6"), - CalicoNode: m("quay.io/calico/node:v3.4.0"), - CalicoCNI: m("quay.io/calico/cni:v3.4.0"), - CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), - CalicoControllers: m("quay.io/calico/kube-controllers:v3.4.0"), - CanalNode: m("quay.io/calico/node:v3.4.0"), - CanalCNI: m("quay.io/calico/cni:v3.4.0"), - CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"), - WeaveNode: m("weaveworks/weave-kube:2.5.0"), - WeaveCNI: m("weaveworks/weave-npc:2.5.0"), - PodInfraContainer: m("gcr.io/google_containers/pause:3.1"), - Ingress: m("rancher/nginx-ingress-controller:nginx-0.32.0-rancher1"), - IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"), - MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"), - CoreDNS: m("coredns/coredns:1.3.1"), - CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"), - }, // Experimental in Rancher v2.2.5 "v1.15.0-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"), @@ -1823,12 +1764,12 @@ var ( KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"), Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"), FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher6"), - CalicoNode: m("quay.io/calico/node:v3.7.4"), - CalicoCNI: m("quay.io/calico/cni:v3.7.4"), - CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), - CalicoControllers: m("quay.io/calico/kube-controllers:v3.7.4"), - CanalNode: m("quay.io/calico/node:v3.7.4"), - CanalCNI: m("quay.io/calico/cni:v3.7.4"), + CalicoNode: m("quay.io/calico/node:v3.8.9"), + CalicoCNI: m("quay.io/calico/cni:v3.8.9"), + CalicoCtl: m("quay.io/calico/ctl:v3.8.9"), + CalicoControllers: m("quay.io/calico/kube-controllers:v3.8.9"), + CanalNode: m("quay.io/calico/node:v3.8.9"), + CanalCNI: m("quay.io/calico/cni:v3.8.9"), CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"), WeaveNode: m("weaveworks/weave-kube:2.5.2"), WeaveCNI: m("weaveworks/weave-npc:2.5.2"),