rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-01 23:16:22 +00:00
Code Issues Releases Wiki Activity

Use default images from types

Browse Source
This commit is contained in:
moelsayed
2018-02-26 18:27:32 +02:00
parent c941eab5ee
commit eddb9ec56b
3 changed files with 40 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/config.go
View File

@@ -245,13 +245,15 @@ func getServiceConfig(reader *bufio.Reader) (*v3.RKEConfigServices, error) {
servicesConfig.Kubelet = v3.KubeletService{}
servicesConfig.Kubeproxy = v3.KubeproxyService{}
etcdImage, err := getConfig(reader, "Etcd Docker Image", cluster.DefaultEtcdImage)
imageDefaults := v3.K8sVersionToRKESystemImages[cluster.DefaultK8sVersion]
etcdImage, err := getConfig(reader, "Etcd Docker Image", imageDefaults.Etcd)
if err != nil {
return nil, err
}
servicesConfig.Etcd.Image = etcdImage
kubeImage, err := getConfig(reader, "Kubernetes Docker image", cluster.DefaultK8sImage)
kubeImage, err := getConfig(reader, "Kubernetes Docker image", imageDefaults.Kubernetes)
if err != nil {
return nil, err
}
@@ -296,7 +298,7 @@ func getServiceConfig(reader *bufio.Reader) (*v3.RKEConfigServices, error) {
}
servicesConfig.Kubelet.ClusterDNSServer = clusterDNSServiceIP
infraPodImage, err := getConfig(reader, "Infra Container image", cluster.DefaultInfraContainerImage)
infraPodImage, err := getConfig(reader, "Infra Container image", imageDefaults.PodInfraContainer)
if err != nil {
return nil, err
}