From a59ea16f50d27ea37a1f3170dad1097d29ce71f6 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Mon, 7 Jan 2019 23:19:55 +0200 Subject: [PATCH] Update kubernetes to v1.13 calico and ingress controller --- apis/management.cattle.io/v3/k8s_defaults.go | 27 ++++++++++--------- .../v3/k8s_windows_default.go | 7 +++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index e08523e2..8f2117c3 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -21,6 +21,7 @@ var ( "v1.10.12-rancher1-1", "v1.11.6-rancher1-1", "v1.12.4-rancher1-1", + "v1.13.1-rancher1-1", } // K8sVersionToRKESystemImages is dynamically populated on init() with the latest versions @@ -28,7 +29,7 @@ var ( // K8sVersionServiceOptions - service options per k8s version K8sVersionServiceOptions = map[string]KubernetesServicesOptions{ - "v1.12": { + "v1.13": { KubeAPI: map[string]string{ "tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305", "enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota", @@ -745,29 +746,29 @@ var ( IngressBackend: m("k8s.gcr.io/defaultbackend:1.4"), MetricsServer: m("gcr.io/google_containers/metrics-server-amd64:v0.3.1"), }, - "v1.12.4-rancher1-1": { + "v1.13.1-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.2.24"), - Kubernetes: m("rancher/hyperkube:v1.12.4-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.13.1-rancher1"), Alpine: m("rancher/rke-tools:v0.1.20"), NginxProxy: m("rancher/rke-tools:v0.1.20"), CertDownloader: m("rancher/rke-tools:v0.1.20"), KubernetesServicesSidecar: m("rancher/rke-tools:v0.1.20"), - KubeDNS: m("gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.13"), - DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.13"), - KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.13"), + 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.1.3"), - CalicoCNI: m("quay.io/calico/cni:v3.1.3"), + 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.1.3"), - CanalCNI: m("quay.io/calico/cni:v3.1.3"), + 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.1.2"), - WeaveCNI: m("weaveworks/weave-npc:2.1.2"), + 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.16.2-rancher1"), + 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"), }, diff --git a/apis/management.cattle.io/v3/k8s_windows_default.go b/apis/management.cattle.io/v3/k8s_windows_default.go index de7fc4f9..02ef3fe5 100644 --- a/apis/management.cattle.io/v3/k8s_windows_default.go +++ b/apis/management.cattle.io/v3/k8s_windows_default.go @@ -50,14 +50,13 @@ var ( "cadvisor-port": "", }, }, - "v1.12": { + "v1.13": { Kubelet: map[string]string{ "tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305", "feature-gates": "MountPropagation=false,HyperVContainer=true", "cgroups-per-qos": "false", "enforce-node-allocatable": "", "resolv-conf": "", - "cadvisor-port": "", }, }, } @@ -264,9 +263,9 @@ var ( CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"), KubeletPause: m("rancher/kubelet-pause:v0.0.1-nanoserver-1803"), }, - "v1.12.4-rancher1-1": { + "v1.13.1-rancher1-1": { NginxProxy: m("rancher/nginx-proxy:v0.0.1-nanoserver-1803"), - KubernetesBinaries: m("rancher/hyperkube:v1.12.4-nanoserver-1803"), + KubernetesBinaries: m("rancher/hyperkube:v1.13.1-nanoserver-1803"), FlannelCNIBinaries: m("rancher/flannel-cni:v0.0.1-nanoserver-1803"), CalicoCNIBinaries: m("rancher/calico-cni:v0.0.1-nanoserver-1803"), CanalCNIBinaries: m("rancher/canal-cni:v0.0.1-nanoserver-1803"),