From 7680ca994f7d96eeb02667f8cc40de9bdc48e93b Mon Sep 17 00:00:00 2001 From: Alena Prokharchyk Date: Mon, 16 Jul 2018 15:28:34 -0700 Subject: [PATCH] Legacy API versions --- apis/management.cattle.io/v3/k8s_defaults.go | 159 ++++++++++--------- 1 file changed, 81 insertions(+), 78 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index f6a33ba3..33429e7b 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -11,84 +11,6 @@ var ( // K8sVersionToRKESystemImages - images map for 2.0 K8sVersionToRKESystemImages = map[string]RKESystemImages{ - "v1.8.10-rancher1-1": { - Etcd: m("quay.io/coreos/etcd:v3.0.17"), - Kubernetes: m("rancher/hyperkube:v1.8.10-rancher2"), - Alpine: m("rancher/rke-tools:v0.1.4"), - NginxProxy: m("rancher/rke-tools:v0.1.4"), - CertDownloader: m("rancher/rke-tools:v0.1.4"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), - KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5"), - DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5"), - KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5"), - KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), - Flannel: m("quay.io/coreos/flannel:v0.9.1"), - FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"), - CalicoNode: m("quay.io/calico/node:v3.1.1"), - CalicoCNI: m("quay.io/calico/cni:v3.1.1"), - CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), - CanalNode: m("quay.io/calico/node:v3.1.1"), - CanalCNI: m("quay.io/calico/cni:v3.1.1"), - CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"), - 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.10.2-rancher3"), - IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), - MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), - }, - "v1.8.11-rancher1": { - Etcd: m("quay.io/coreos/etcd:v3.0.17"), - Kubernetes: m("rancher/hyperkube:v1.8.11-rancher2"), - Alpine: m("rancher/rke-tools:v0.1.4"), - NginxProxy: m("rancher/rke-tools:v0.1.4"), - CertDownloader: m("rancher/rke-tools:v0.1.4"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), - KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5"), - DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5"), - KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5"), - KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), - Flannel: m("quay.io/coreos/flannel:v0.9.1"), - FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"), - CalicoNode: m("quay.io/calico/node:v3.1.1"), - CalicoCNI: m("quay.io/calico/cni:v3.1.1"), - CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), - CanalNode: m("quay.io/calico/node:v3.1.1"), - CanalCNI: m("quay.io/calico/cni:v3.1.1"), - CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"), - 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.10.2-rancher3"), - IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), - MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), - }, - "v1.8.11-rancher2-1": { - Etcd: m("quay.io/coreos/etcd:v3.0.17"), - Kubernetes: m("rancher/hyperkube:v1.8.11-rancher2"), - Alpine: m("rancher/rke-tools:v0.1.8"), - NginxProxy: m("rancher/rke-tools:v0.1.8"), - CertDownloader: m("rancher/rke-tools:v0.1.8"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.8"), - KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5"), - DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5"), - KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5"), - KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), - Flannel: m("quay.io/coreos/flannel:v0.9.1"), - FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"), - CalicoNode: m("quay.io/calico/node:v3.1.1"), - CalicoCNI: m("quay.io/calico/cni:v3.1.1"), - CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), - CanalNode: m("quay.io/calico/node:v3.1.1"), - CanalCNI: m("quay.io/calico/cni:v3.1.1"), - CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"), - 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.10.2-rancher3"), - IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), - MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), - }, "v1.9.5-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.9.5-rancher1"), @@ -342,4 +264,85 @@ var ( Busybox: m("busybox"), }, } + + // LegacyK8sVersionToRKESystemImages - legacy images map + // Get to keep non-supported version because they are being referenced in dynamic manner by rancher code; + // so kept them in the separate data structure. Can be removed only if we decide to persist them on a cluster object. + LegacyK8sVersionToRKESystemImages = map[string]RKESystemImages{ + "v1.8.10-rancher1-1": { + Etcd: m("quay.io/coreos/etcd:v3.0.17"), + Kubernetes: m("rancher/hyperkube:v1.8.10-rancher2"), + Alpine: m("rancher/rke-tools:v0.1.4"), + NginxProxy: m("rancher/rke-tools:v0.1.4"), + CertDownloader: m("rancher/rke-tools:v0.1.4"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.9.1"), + FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"), + CalicoNode: m("quay.io/calico/node:v3.1.1"), + CalicoCNI: m("quay.io/calico/cni:v3.1.1"), + CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), + CanalNode: m("quay.io/calico/node:v3.1.1"), + CanalCNI: m("quay.io/calico/cni:v3.1.1"), + CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"), + 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.10.2-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + }, + "v1.8.11-rancher1": { + Etcd: m("quay.io/coreos/etcd:v3.0.17"), + Kubernetes: m("rancher/hyperkube:v1.8.11-rancher2"), + Alpine: m("rancher/rke-tools:v0.1.4"), + NginxProxy: m("rancher/rke-tools:v0.1.4"), + CertDownloader: m("rancher/rke-tools:v0.1.4"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.4"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.9.1"), + FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"), + CalicoNode: m("quay.io/calico/node:v3.1.1"), + CalicoCNI: m("quay.io/calico/cni:v3.1.1"), + CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), + CanalNode: m("quay.io/calico/node:v3.1.1"), + CanalCNI: m("quay.io/calico/cni:v3.1.1"), + CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"), + 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.10.2-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + }, + "v1.8.11-rancher2-1": { + Etcd: m("quay.io/coreos/etcd:v3.0.17"), + Kubernetes: m("rancher/hyperkube:v1.8.11-rancher2"), + Alpine: m("rancher/rke-tools:v0.1.8"), + NginxProxy: m("rancher/rke-tools:v0.1.8"), + CertDownloader: m("rancher/rke-tools:v0.1.8"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.8"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.9.1"), + FlannelCNI: m("quay.io/coreos/flannel-cni:v0.2.0"), + CalicoNode: m("quay.io/calico/node:v3.1.1"), + CalicoCNI: m("quay.io/calico/cni:v3.1.1"), + CalicoCtl: m("quay.io/calico/ctl:v2.0.0"), + CanalNode: m("quay.io/calico/node:v3.1.1"), + CanalCNI: m("quay.io/calico/cni:v3.1.1"), + CanalFlannel: m("quay.io/coreos/flannel:v0.9.1"), + 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.10.2-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + }, + } )