rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-19 10:26:20 +00:00
Code Issues Releases Wiki Activity

Move interactive image config out of services

Browse Source
This commit is contained in:
moelsayed
2018-06-18 22:11:47 +02:00
committed by Alena Prokharchyk
parent 4c30f1a28d
commit 557e9a7bde
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
cmd/config.go
View File

@@ -141,6 +141,13 @@ func clusterConfig(ctx *cli.Context) error {
} }
cluster.Authorization = *authzConfig cluster.Authorization = *authzConfig
// Get k8s/system images
systemImages, err := getSystemImagesConfig(reader)
if err != nil {
return err
}
cluster.SystemImages = *systemImages
// Get Services Config // Get Services Config
serviceConfig, err := getServiceConfig(reader) serviceConfig, err := getServiceConfig(reader)
if err != nil { if err != nil {
@@ -246,6 +253,22 @@ func getHostConfig(reader *bufio.Reader, index int, clusterSSHKeyPath string) (*
return &host, nil return &host, nil
} }
func getSystemImagesConfig(reader *bufio.Reader) (*v3.RKESystemImages, error) {
imageDefaults := v3.K8sVersionToRKESystemImages[cluster.DefaultK8sVersion]
kubeImage, err := getConfig(reader, "Kubernetes Docker image", imageDefaults.Kubernetes)
if err != nil {
return nil, err
}
systemImages, ok := v3.K8sVersionToRKESystemImages[kubeImage]
if ok {
return &systemImages, nil
}
imageDefaults.Kubernetes = kubeImage
return &imageDefaults, nil
}
func getServiceConfig(reader *bufio.Reader) (*v3.RKEConfigServices, error) { func getServiceConfig(reader *bufio.Reader) (*v3.RKEConfigServices, error) {
servicesConfig := v3.RKEConfigServices{} servicesConfig := v3.RKEConfigServices{}
servicesConfig.Etcd = v3.ETCDService{} servicesConfig.Etcd = v3.ETCDService{}
@@ -255,24 +278,6 @@ func getServiceConfig(reader *bufio.Reader) (*v3.RKEConfigServices, error) {
servicesConfig.Kubelet = v3.KubeletService{} servicesConfig.Kubelet = v3.KubeletService{}
servicesConfig.Kubeproxy = v3.KubeproxyService{} servicesConfig.Kubeproxy = v3.KubeproxyService{}
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", imageDefaults.Kubernetes)
if err != nil {
return nil, err
}
servicesConfig.KubeAPI.Image = kubeImage
servicesConfig.KubeController.Image = kubeImage
servicesConfig.Scheduler.Image = kubeImage
servicesConfig.Kubelet.Image = kubeImage
servicesConfig.Kubeproxy.Image = kubeImage
clusterDomain, err := getConfig(reader, "Cluster domain", cluster.DefaultClusterDomain) clusterDomain, err := getConfig(reader, "Cluster domain", cluster.DefaultClusterDomain)
if err != nil { if err != nil {
return nil, err return nil, err
@@ -308,11 +313,6 @@ func getServiceConfig(reader *bufio.Reader) (*v3.RKEConfigServices, error) {
} }
servicesConfig.Kubelet.ClusterDNSServer = clusterDNSServiceIP servicesConfig.Kubelet.ClusterDNSServer = clusterDNSServiceIP
infraPodImage, err := getConfig(reader, "Infra Container image", imageDefaults.PodInfraContainer)
if err != nil {
return nil, err
}
servicesConfig.Kubelet.InfraContainerImage = infraPodImage
return &servicesConfig, nil return &servicesConfig, nil
} }