From 3d9025136808c5c40cbc7b45d0e54567270a3ee9 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Tue, 7 Apr 2020 22:01:57 +0200 Subject: [PATCH] Revert system images tags for latest k8s versions K8s versions v1.14.10-rancher1-1 and v1.15.11-rancher1-0 don't need any other system images updates besides the k8s image itself --- apis/management.cattle.io/v3/k8s_defaults.go | 29 ++++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 079b335c..4a348d5e 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -1540,14 +1540,14 @@ 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.10 + // Enabled in Rancher v2.2.11 "v1.14.10-rancher1-1": { 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"), + 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"), @@ -1557,7 +1557,6 @@ var ( 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.10.0"), @@ -1724,22 +1723,22 @@ var ( "v1.15.11-rancher1-0": { Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"), Kubernetes: m("rancher/hyperkube:v1.15.11-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"), + 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.3.0"), Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"), FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"), - CalicoNode: m("quay.io/calico/node:v3.13.0"), - CalicoCNI: m("quay.io/calico/cni:v3.13.0"), + 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.13.0"), - CanalNode: m("quay.io/calico/node:v3.13.0"), - CanalCNI: m("quay.io/calico/cni:v3.13.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"), 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"),