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

consider service options based on hostOS info

Browse Source
This commit is contained in:
kinarashah
2019-09-06 15:53:14 -07:00
committed by Alena Prokharchyk
parent d6b29c9ccc
commit 9411027476
5 changed files with 65 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/up.go
View File

@@ -88,10 +88,10 @@ func ClusterUp(ctx context.Context, dialersOptions hosts.DialersOptions, flags c
if err != nil {
return APIURL, caCrt, clientCert, clientKey, nil, err
}
svcOptions, _ := data["k8s-service-options"].(*v3.KubernetesServicesOptions)
svcOptionsData := cluster.GetServiceOptionData(data)
// check if rotate certificates is triggered
if kubeCluster.RancherKubernetesEngineConfig.RotateCertificates != nil {
return rebuildClusterWithRotatedCertificates(ctx, dialersOptions, flags, svcOptions)
return rebuildClusterWithRotatedCertificates(ctx, dialersOptions, flags, svcOptionsData)
}
log.Infof(ctx, "Building Kubernetes cluster")
@@ -132,7 +132,7 @@ func ClusterUp(ctx context.Context, dialersOptions hosts.DialersOptions, flags c
return APIURL, caCrt, clientCert, clientKey, nil, err
}
err = cluster.ReconcileCluster(ctx, kubeCluster, currentCluster, flags, svcOptions)
err = cluster.ReconcileCluster(ctx, kubeCluster, currentCluster, flags, svcOptionsData)
if err != nil {
return APIURL, caCrt, clientCert, clientKey, nil, err
}
@@ -145,7 +145,7 @@ func ClusterUp(ctx context.Context, dialersOptions hosts.DialersOptions, flags c
return APIURL, caCrt, clientCert, clientKey, nil, err
}
err = kubeCluster.DeployControlPlane(ctx, svcOptions)
err = kubeCluster.DeployControlPlane(ctx, svcOptionsData)
if err != nil {
return APIURL, caCrt, clientCert, clientKey, nil, err
}
@@ -166,8 +166,7 @@ func ClusterUp(ctx context.Context, dialersOptions hosts.DialersOptions, flags c
return APIURL, caCrt, clientCert, clientKey, nil, err
}
windowsSvcOptions, _ := data["k8s-windows-service-options"].(*v3.KubernetesServicesOptions)
err = kubeCluster.DeployWorkerPlane(ctx, svcOptions, windowsSvcOptions)
err = kubeCluster.DeployWorkerPlane(ctx, svcOptionsData)
if err != nil {
return APIURL, caCrt, clientCert, clientKey, nil, err
}