diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index 58f00491..c1a0d2cc 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -41,7 +41,7 @@ var ( "v1.15": { 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", + "enable-admission-plugins": "NamespaceLifecycle,LimitRanger,ServiceAccount,TaintNodesByCondition,Priority,DefaultTolerationSeconds,DefaultStorageClass,PersistentVolumeClaimResize,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota", }, 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", @@ -1242,7 +1242,7 @@ var ( // Experimental in Rancher v2.2.5 "v1.15.0-rancher1-1": { Etcd: m("quay.io/coreos/etcd:v3.3.10-rancher1"), - Kubernetes: m("rancher/hyperkube:v1.14.3-rancher1"), + Kubernetes: m("rancher/hyperkube:v1.15.0-rancher1"), Alpine: m("rancher/rke-tools:v0.1.32"), NginxProxy: m("rancher/rke-tools:v0.1.32"), CertDownloader: m("rancher/rke-tools:v0.1.32"), @@ -1251,20 +1251,20 @@ var ( DNSmasq: m("gcr.io/google_containers/k8s-dns-dnsmasq-nanny:1.15.0"), KubeDNSSidecar: m("gcr.io/google_containers/k8s-dns-sidecar:1.15.0"), KubeDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"), - Flannel: m("quay.io/coreos/flannel:v0.10.0-rancher1"), + Flannel: m("quay.io/coreos/flannel:v0.11.0-rancher1"), FlannelCNI: m("rancher/flannel-cni:v0.3.0-rancher1"), - CalicoNode: m("quay.io/calico/node:v3.4.0"), - CalicoCNI: m("quay.io/calico/cni:v3.4.0"), + CalicoNode: m("quay.io/calico/node:v3.7.3"), + CalicoCNI: m("quay.io/calico/cni:v3.7.3"), 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"), + CanalNode: m("quay.io/calico/node:v3.7.3"), + CanalCNI: m("quay.io/calico/cni:v3.7.3"), + CanalFlannel: m("quay.io/coreos/flannel:v0.11.0"), + WeaveNode: m("weaveworks/weave-kube:2.5.2"), + WeaveCNI: m("weaveworks/weave-npc:2.5.2"), PodInfraContainer: m("gcr.io/google_containers/pause:3.1"), Ingress: m("rancher/nginx-ingress-controller:0.21.0-rancher3"), IngressBackend: m("k8s.gcr.io/defaultbackend:1.5-rancher1"), - MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.1"), + MetricsServer: m("gcr.io/google_containers/metrics-server:v0.3.3"), CoreDNS: m("coredns/coredns:1.3.1"), CoreDNSAutoscaler: m("gcr.io/google_containers/cluster-proportional-autoscaler:1.3.0"), }, diff --git a/apis/management.cattle.io/v3/k8s_windows_default.go b/apis/management.cattle.io/v3/k8s_windows_default.go index 0191d1c0..0256e699 100644 --- a/apis/management.cattle.io/v3/k8s_windows_default.go +++ b/apis/management.cattle.io/v3/k8s_windows_default.go @@ -369,7 +369,7 @@ var ( }, "v1.15.0-rancher1-1": { // NginxProxy image is replaced by host running nginx, fixed rancher#16074 - KubernetesBinaries: m("rancher/hyperkube:v1.14.3-rancher1"), + KubernetesBinaries: m("rancher/hyperkube:v1.15.0-rancher1"), FlannelCNIBinaries: m("rancher/flannel-cni:v0.3.0-rancher4"), KubeletPause: m("rancher/kubelet-pause:v0.1.2"), },