From e38f27212e941a5d658862307a8d9a65af4a9336 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Fri, 3 Aug 2018 10:26:39 -0700 Subject: [PATCH 1/2] cleaning up k8s types to preserve released versions --- apis/management.cattle.io/v3/k8s_defaults.go | 173 +++++++++---------- 1 file changed, 82 insertions(+), 91 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 822a4a00..0be27b67 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -69,6 +69,80 @@ var ( } AllK8sVersions = 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"), + }, + "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-rancher2"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + }, "v1.9.5-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.9.5-rancher1"), @@ -91,9 +165,8 @@ 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.10.2-rancher2"), + 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.7-rancher1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), @@ -117,9 +190,8 @@ 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.10.2-rancher2"), + 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.7-rancher2-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), @@ -143,9 +215,8 @@ 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.10.2-rancher2"), + 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.7-rancher2-2": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), @@ -195,9 +266,8 @@ 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-rancher2"), + 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.10.1-rancher1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), @@ -221,9 +291,8 @@ 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-rancher2"), + 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.10.1-rancher2-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), @@ -247,9 +316,8 @@ 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-rancher2"), + 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.10.3-rancher2-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), @@ -273,9 +341,8 @@ 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-rancher2"), + 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.10.5-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), @@ -299,9 +366,8 @@ 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-rancher2"), + 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.10.5-rancher1-2": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), @@ -355,81 +421,6 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.2.1"), }, - "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-rancher2"), - 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-rancher2"), - 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-rancher2"), - IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), - }, } ) From da238189653298d0c12ed70474d3744b5140c269 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Fri, 3 Aug 2018 10:29:32 -0700 Subject: [PATCH 2/2] rke-tools v0.1.13 --- apis/management.cattle.io/v3/k8s_defaults.go | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 0be27b67..79d60de0 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -221,10 +221,10 @@ var ( "v1.9.7-rancher2-2": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.9.7-rancher2"), - Alpine: m("rancher/rke-tools:v0.1.12"), - NginxProxy: m("rancher/rke-tools:v0.1.12"), - CertDownloader: m("rancher/rke-tools:v0.1.12"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.12"), + Alpine: m("rancher/rke-tools:v0.1.13"), + NginxProxy: m("rancher/rke-tools:v0.1.13"), + CertDownloader: m("rancher/rke-tools:v0.1.13"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.13"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.7"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.7"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.7"), @@ -372,10 +372,10 @@ var ( "v1.10.5-rancher1-2": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.10.5-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.12"), - NginxProxy: m("rancher/rke-tools:v0.1.12"), - CertDownloader: m("rancher/rke-tools:v0.1.12"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.12"), + Alpine: m("rancher/rke-tools:v0.1.13"), + NginxProxy: m("rancher/rke-tools:v0.1.13"), + CertDownloader: m("rancher/rke-tools:v0.1.13"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.13"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.8"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.8"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.8"), @@ -398,10 +398,10 @@ var ( "v1.11.1-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.18"), Kubernetes: m("rancher/hyperkube:v1.11.1-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.12"), - NginxProxy: m("rancher/rke-tools:v0.1.12"), - CertDownloader: m("rancher/rke-tools:v0.1.12"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.12"), + Alpine: m("rancher/rke-tools:v0.1.13"), + NginxProxy: m("rancher/rke-tools:v0.1.13"), + CertDownloader: m("rancher/rke-tools:v0.1.13"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.13"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.10"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.10"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.10"),