rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-12 13:18:47 +00:00
Code Issues Releases Wiki Activity

Merge pull request #185 from galal-hussein/save_cert

Browse Source 
Save certificates/state after deploying control plane
This commit is contained in:
Alena Prokharchyk
2018-01-02 13:34:09 -08:00
committed by GitHub
parent b9f2fd8acb bb008ba58a
commit 00ffa8eec7
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cluster/cluster.go
View File

@@ -52,32 +52,35 @@ const (
NoneAuthorizationMode = "none" NoneAuthorizationMode = "none"
) )
func (c *Cluster) DeployClusterPlanes() error { func (c *Cluster) DeployControlPlane() error {
// Deploy Kubernetes Planes // Deploy Etcd Plane
err := services.RunEtcdPlane(c.EtcdHosts, c.Services.Etcd) if err := services.RunEtcdPlane(c.EtcdHosts, c.Services.Etcd); err != nil {
if err != nil {
return fmt.Errorf("[etcd] Failed to bring up Etcd Plane: %v", err) return fmt.Errorf("[etcd] Failed to bring up Etcd Plane: %v", err)
} }
err = services.RunControlPlane(c.ControlPlaneHosts, // Deploy Control plane
if err := services.RunControlPlane(c.ControlPlaneHosts,
c.EtcdHosts, c.EtcdHosts,
c.Services, c.Services,
c.SystemImages[ServiceSidekickImage], c.SystemImages[ServiceSidekickImage],
c.Authorization.Mode, c.Authorization.Mode,
c.HealthcheckDialerFactory) c.HealthcheckDialerFactory); err != nil {
if err != nil {
return fmt.Errorf("[controlPlane] Failed to bring up Control Plane: %v", err) return fmt.Errorf("[controlPlane] Failed to bring up Control Plane: %v", err)
} }
err = c.ApplyAuthzResources() // Apply Authz configuration after deploying controlplane
if err != nil { if err := c.ApplyAuthzResources(); err != nil {
return fmt.Errorf("[auths] Failed to apply RBAC resources: %v", err) return fmt.Errorf("[auths] Failed to apply RBAC resources: %v", err)
} }
err = services.RunWorkerPlane(c.ControlPlaneHosts, return nil
}
func (c *Cluster) DeployWorkerPlane() error {
// Deploy Worker Plane
if err := services.RunWorkerPlane(c.ControlPlaneHosts,
c.WorkerHosts, c.WorkerHosts,
c.Services, c.Services,
c.SystemImages[NginxProxyImage], c.SystemImages[NginxProxyImage],
c.SystemImages[ServiceSidekickImage], c.SystemImages[ServiceSidekickImage],
c.HealthcheckDialerFactory) c.HealthcheckDialerFactory); err != nil {
if err != nil {
return fmt.Errorf("[workerPlane] Failed to bring up Worker Plane: %v", err) return fmt.Errorf("[workerPlane] Failed to bring up Worker Plane: %v", err)
} }
return nil return nil

7
cmd/up.go
View File

@@ -68,7 +68,7 @@ func ClusterUp(rkeConfig *v3.RancherKubernetesEngineConfig, dockerDialerFactory,
return APIURL, caCrt, clientCert, clientKey, err return APIURL, caCrt, clientCert, clientKey, err
} }
err = kubeCluster.DeployClusterPlanes() err = kubeCluster.DeployControlPlane()
if err != nil { if err != nil {
return APIURL, caCrt, clientCert, clientKey, err return APIURL, caCrt, clientCert, clientKey, err
} }
@@ -78,6 +78,11 @@ func ClusterUp(rkeConfig *v3.RancherKubernetesEngineConfig, dockerDialerFactory,
return APIURL, caCrt, clientCert, clientKey, err return APIURL, caCrt, clientCert, clientKey, err
} }
err = kubeCluster.DeployWorkerPlane()
if err != nil {
return APIURL, caCrt, clientCert, clientKey, err
}
err = kubeCluster.DeployNetworkPlugin() err = kubeCluster.DeployNetworkPlugin()
if err != nil { if err != nil {
return APIURL, caCrt, clientCert, clientKey, err return APIURL, caCrt, clientCert, clientKey, err