From c7ee8b4f4f0831ea5652524276442162016de208 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Wed, 16 May 2018 11:56:37 -0700 Subject: [PATCH 1/5] revert back to what was shipped in 2.0 --- apis/management.cattle.io/v3/k8s_defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 67601152..fcb81c6e 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -8,7 +8,7 @@ const ( var ( m = image.Mirror - ToolsImage = m("rancher/rke-tools:v0.1.7") + ToolsImage = m("rancher/rke-tools:v0.1.4") // K8sVersionToRKESystemImages - images map for 2.0 K8sVersionToRKESystemImages = map[string]RKESystemImages{ From c539c384e2cf6e7ab1b41b747beaf5fb1f650c51 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Wed, 16 May 2018 11:58:26 -0700 Subject: [PATCH 2/5] replace tools image constant with actual images --- apis/management.cattle.io/v3/k8s_defaults.go | 51 ++++++++++---------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index fcb81c6e..4515defe 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -8,17 +8,16 @@ const ( var ( m = image.Mirror - ToolsImage = m("rancher/rke-tools:v0.1.4") // 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: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + 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"), @@ -40,10 +39,10 @@ var ( "v1.8.11-rancher1": { Etcd: m("quay.io/coreos/etcd:v3.0.17"), Kubernetes: m("rancher/hyperkube:v1.8.11-rancher2"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + 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"), @@ -65,10 +64,10 @@ var ( "v1.9.7-rancher1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.9.7-rancher2"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + 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.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"), @@ -90,10 +89,10 @@ var ( "v1.9.5-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.9.5-rancher1"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + 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.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"), @@ -115,10 +114,10 @@ var ( "v1.10.0-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.10.0-rancher1"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + 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.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"), @@ -140,10 +139,10 @@ var ( "v1.10.1-rancher1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.10.1-rancher2"), - Alpine: ToolsImage, - NginxProxy: ToolsImage, - CertDownloader: ToolsImage, - KubernetesServicesSidecar: ToolsImage, + 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.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"), @@ -200,7 +199,7 @@ var ( LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.3"), Elaticsearch: m("quay.io/pires/docker-elasticsearch-kubernetes:5.6.2"), Kibana: m("kibana:5.6.4"), - Busybox: ToolsImage, + Busybox: m("rancher/rke-tools:v0.1.4"), }, } ) From 6fc6024fdfd8d89834e2369c1968d1cacb7c7868 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Wed, 16 May 2018 12:01:50 -0700 Subject: [PATCH 3/5] add new versions for each minor version --- apis/management.cattle.io/v3/k8s_defaults.go | 79 +++++++++++++++++++- 1 file changed, 77 insertions(+), 2 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 4515defe..1795bc17 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -61,6 +61,56 @@ var ( 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.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.9.5-rancher1-1": { + Etcd: m("quay.io/coreos/etcd:v3.1.12"), + Kubernetes: m("rancher/hyperkube:v1.9.5-rancher1"), + 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.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"), + 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.9.7-rancher1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.9.7-rancher2"), @@ -86,9 +136,9 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), }, - "v1.9.5-rancher1-1": { + "v1.9.7-rancher2-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), - Kubernetes: m("rancher/hyperkube:v1.9.5-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.9.7-rancher2-1"), Alpine: m("rancher/rke-tools:v0.1.4"), NginxProxy: m("rancher/rke-tools:v0.1.4"), CertDownloader: m("rancher/rke-tools:v0.1.4"), @@ -161,6 +211,31 @@ var ( Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), }, + "v1.10.1-rancher2-1": { + Etcd: m("quay.io/coreos/etcd:v3.1.12"), + Kubernetes: m("rancher/hyperkube:v1.10.1-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.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"), + 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.1"), + Ingress: m("rancher/nginx-ingress-controller:0.10.2-rancher3"), + IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), + }, } // K8sVersionServiceOptions - service options per k8s version From fc34dd656b83b6411ba9f6617596a1cba3fa2314 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Wed, 16 May 2018 12:02:48 -0700 Subject: [PATCH 4/5] update rke-tools to v0.1.7 --- 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 1795bc17..23f72636 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -64,10 +64,10 @@ var ( "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.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"), + Alpine: m("rancher/rke-tools:v0.1.7"), + NginxProxy: m("rancher/rke-tools:v0.1.7"), + CertDownloader: m("rancher/rke-tools:v0.1.7"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.7"), 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"), @@ -139,10 +139,10 @@ var ( "v1.9.7-rancher2-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.9.7-rancher2-1"), - 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"), + Alpine: m("rancher/rke-tools:v0.1.7"), + NginxProxy: m("rancher/rke-tools:v0.1.7"), + CertDownloader: m("rancher/rke-tools:v0.1.7"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.7"), 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"), @@ -214,10 +214,10 @@ var ( "v1.10.1-rancher2-1": { Etcd: m("quay.io/coreos/etcd:v3.1.12"), Kubernetes: m("rancher/hyperkube:v1.10.1-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"), + Alpine: m("rancher/rke-tools:v0.1.7"), + NginxProxy: m("rancher/rke-tools:v0.1.7"), + CertDownloader: m("rancher/rke-tools:v0.1.7"), + KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.7"), 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"), From 7b7ced1c3a1c31791eec2e678d876d6a44f4a962 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Wed, 16 May 2018 12:06:15 -0700 Subject: [PATCH 5/5] change logging to use busybox instead of rke-tools --- apis/management.cattle.io/v3/k8s_defaults.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 23f72636..6a9583c2 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -7,7 +7,7 @@ const ( ) var ( - m = image.Mirror + m = image.Mirror // K8sVersionToRKESystemImages - images map for 2.0 K8sVersionToRKESystemImages = map[string]RKESystemImages{ @@ -274,7 +274,7 @@ var ( LogAggregatorFlexVolumeDriver: m("rancher/log-aggregator:v0.1.3"), Elaticsearch: m("quay.io/pires/docker-elasticsearch-kubernetes:5.6.2"), Kibana: m("kibana:5.6.4"), - Busybox: m("rancher/rke-tools:v0.1.4"), + Busybox: m("busybox"), }, } )