From 790a70af644b10ada3580ceded61fd907160eef2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Fri, 16 Aug 2019 20:27:53 +0200 Subject: [PATCH 1/2] copy data --- apis/management.cattle.io/v3/k8s_defaults.go | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 6fb09c49..963c7a09 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -985,6 +985,32 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"), }, + "v1.13.9-rancher1-1": { + Etcd: m("quay.io/coreos/etcd:v3.2.24"), + Kubernetes: m("rancher/hyperkube:v1.13.9-rancher1"), + Alpine: m("rancher/rke-tools:v0.1.16"), + NginxProxy: m("rancher/rke-tools:v0.1.16"), + CertDownloader: m("rancher/rke-tools:v0.1.16"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16"), + KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.15.0"), + DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.15.0"), + KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.15.0"), + KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.0.0"), + Flannel: m("quay.io/coreos/flannel:v0.10.0"), + FlannelCNI: m("quay.io/coreos/flannel-cni:v0.3.0"), + 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"), + WeaveNode: m("weaveworks/weave-kube:2.5.0"), + WeaveCNI: m("weaveworks/weave-npc:2.5.0"), + PodInfraContainer: m("gcr.io/google_containers/pause-amd64:3.1"), + Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher1"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"), + }, } ) From f4a6d9000e1d9e6691ce854064450b9b7855a130 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Fri, 16 Aug 2019 20:28:57 +0200 Subject: [PATCH 2/2] Add v1.13.9-rancher1-3 to test rke-tools v0.1.16-1 --- 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 963c7a09..b6dea0e2 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -9,7 +9,7 @@ import ( ) const ( - DefaultK8s = "v1.13.9-rancher1-1" + DefaultK8s = "v1.13.9-rancher1-3" ) var ( @@ -19,7 +19,7 @@ var ( k8sVersionsCurrent = []string{ "v1.11.9-rancher1-1", "v1.12.7-rancher1-1", - "v1.13.9-rancher1-1", + "v1.13.9-rancher1-3", } // K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions @@ -985,13 +985,13 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"), }, - "v1.13.9-rancher1-1": { + "v1.13.9-rancher1-3": { Etcd: m("quay.io/coreos/etcd:v3.2.24"), Kubernetes: m("rancher/hyperkube:v1.13.9-rancher1"), - Alpine: m("rancher/rke-tools:v0.1.16"), - NginxProxy: m("rancher/rke-tools:v0.1.16"), - CertDownloader: m("rancher/rke-tools:v0.1.16"), - KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16"), + Alpine: m("rancher/rke-tools:v0.1.16-1"), + NginxProxy: m("rancher/rke-tools:v0.1.16-1"), + CertDownloader: m("rancher/rke-tools:v0.1.16-1"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.16-1"), KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.15.0"), DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.15.0"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.15.0"),