From 36e00742658bc1b1ab1d52aa183eaade3dd57528 Mon Sep 17 00:00:00 2001 From: kinarashah Date: Wed, 27 May 2020 17:46:37 -0700 Subject: [PATCH] update system images for current k8s versions --- apis/management.cattle.io/v3/k8s_defaults.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 447a8084..5195c90e 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -1320,14 +1320,14 @@ var ( 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.10.0-rancher1"), - FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher1"), + 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.10.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"), @@ -1611,15 +1611,15 @@ var ( 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.10.0-rancher1"), - FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher5"), + 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.10.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"), @@ -1822,7 +1822,7 @@ var ( 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"), + 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"),