diff --git a/apis/management.cattle.io/v3/k8s_defaults.go b/apis/management.cattle.io/v3/k8s_defaults.go index a19239ef..c8e3007b 100644 --- a/apis/management.cattle.io/v3/k8s_defaults.go +++ b/apis/management.cattle.io/v3/k8s_defaults.go @@ -1,23 +1,24 @@ package v3 const ( - K8sV18 = "v1.8.9-rancher1-1" - K8sV19 = "v1.9.5-rancher1-1" + K8sV18 = "v1.8.9-rancher1-1" + K8sV19 = "v1.9.5-rancher1-1" + K8sV110 = "v1.10.0-rancher1-1" ) var ( // K8sVersionToRKESystemImages - images map for 2.0 K8sVersionToRKESystemImages = map[string]RKESystemImages{ - "v1.8.9-rancher1-1": v18SystemImages, - "v1.9.4-rancher1-1": v19SystemImages, - "v1.9.5-rancher1-1": v19SystemImages, + "v1.8.9-rancher1-1": v18SystemImages, + "v1.9.5-rancher1-1": v19SystemImages, + "v1.10.0-rancher1-1": v110SystemImages, } // K8SVersionToSystemImages16 - images map for 1.6. Keeping it sepate in case we have to diverge K8SVersionToSystemImages16 = map[string]RKESystemImages{ - "v1.8.9-rancher1-1": v18SystemImages, - "v1.9.4-rancher1-1": v19SystemImages, - "v1.9.5-rancher1-1": v19SystemImages, + "v1.8.9-rancher1-1": v18SystemImages, + "v1.9.5-rancher1-1": v19SystemImages, + "v1.10.0-rancher1-1": v110SystemImages, } // ToolsSystemImages default images for alert, pipeline, logging @@ -103,4 +104,36 @@ var ( Tiller: "rancher/tiller:v2.7.2", Dashboard: "rancher/kubernetes-dashboard-amd64:v1.8.0", } + + // v110 system images defaults + v110SystemImages = RKESystemImages{ + Etcd: "rancher/coreos-etcd:v3.1.12", + Kubernetes: "rancher/k8s:" + K8sV110, + Alpine: "alpine:latest", + NginxProxy: "rancher/rke-nginx-proxy:v0.1.1", + CertDownloader: "rancher/rke-cert-deployer:v0.1.1", + KubernetesServicesSidecar: "rancher/rke-service-sidekick:v0.1.1", + KubeDNS: "rancher/k8s-dns-kube-dns-amd64:1.14.8", + DNSmasq: "rancher/k8s-dns-dnsmasq-nanny-amd64:1.14.8", + KubeDNSSidecar: "rancher/k8s-dns-sidecar-amd64:1.14.8", + KubeDNSAutoscaler: "rancher/cluster-proportional-autoscaler-amd64:1.0.0", + Flannel: "rancher/coreos-flannel:v0.9.1", + FlannelCNI: "rancher/coreos-flannel-cni:v0.2.0", + CalicoNode: "rancher/calico-node:v3.0.2", + CalicoCNI: "rancher/calico-cni:v2.0.0", + CalicoCtl: "rancher/calico-ctl:v2.0.0", + CanalNode: "rancher/calico-node:v2.6.2", + CanalCNI: "rancher/calico-cni:v1.11.0", + CanalFlannel: "rancher/coreos-flannel:v0.9.1", + WeaveNode: "weaveworks/weave-kube:2.1.2", + WeaveCNI: "weaveworks/weave-npc:2.1.2", + PodInfraContainer: "rancher/pause-amd64:3.1", + Ingress: "rancher/nginx-ingress-controller:0.10.2", + IngressBackend: "rancher/nginx-ingress-controller-defaultbackend:1.4", + Grafana: "rancher/heapster-grafana-amd64:v4.4.3", + Heapster: "rancher/heapster-amd64:v1.5.0", + Influxdb: "rancher/heapster-influxdb-amd64:v1.3.3", + Tiller: "rancher/tiller:v2.8.2", + Dashboard: "rancher/kubernetes-dashboard-amd64:v1.8.3", + } )