From bb008ba58ac9db99d31bf248def56ec717775f82 Mon Sep 17 00:00:00 2001
From: galal-hussein <hussein.galal.ahmed.11@gmail.com>
Date: Wed, 27 Dec 2017 00:07:25 +0200
Subject: [PATCH] Save certificate after deploying control plane

---
 cluster/cluster.go | 27 +++++++++++++++------------
 cmd/up.go          |  7 ++++++-
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/cluster/cluster.go b/cluster/cluster.go
index 28cfa328..64d9faa0 100644
--- a/cluster/cluster.go
+++ b/cluster/cluster.go
@@ -52,32 +52,35 @@ const (
 	NoneAuthorizationMode      = "none"
 )
 
-func (c *Cluster) DeployClusterPlanes() error {
-	// Deploy Kubernetes Planes
-	err := services.RunEtcdPlane(c.EtcdHosts, c.Services.Etcd)
-	if err != nil {
+func (c *Cluster) DeployControlPlane() error {
+	// Deploy Etcd Plane
+	if err := services.RunEtcdPlane(c.EtcdHosts, c.Services.Etcd); err != nil {
 		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.Services,
 		c.SystemImages[ServiceSidekickImage],
 		c.Authorization.Mode,
-		c.HealthcheckDialerFactory)
-	if err != nil {
+		c.HealthcheckDialerFactory); err != nil {
 		return fmt.Errorf("[controlPlane] Failed to bring up Control Plane: %v", err)
 	}
-	err = c.ApplyAuthzResources()
-	if err != nil {
+	// Apply Authz configuration after deploying controlplane
+	if err := c.ApplyAuthzResources(); err != nil {
 		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.Services,
 		c.SystemImages[NginxProxyImage],
 		c.SystemImages[ServiceSidekickImage],
-		c.HealthcheckDialerFactory)
-	if err != nil {
+		c.HealthcheckDialerFactory); err != nil {
 		return fmt.Errorf("[workerPlane] Failed to bring up Worker Plane: %v", err)
 	}
 	return nil
diff --git a/cmd/up.go b/cmd/up.go
index 956ac459..81a044be 100644
--- a/cmd/up.go
+++ b/cmd/up.go
@@ -68,7 +68,7 @@ func ClusterUp(rkeConfig *v3.RancherKubernetesEngineConfig, dockerDialerFactory,
 		return APIURL, caCrt, clientCert, clientKey, err
 	}
 
-	err = kubeCluster.DeployClusterPlanes()
+	err = kubeCluster.DeployControlPlane()
 	if err != nil {
 		return APIURL, caCrt, clientCert, clientKey, err
 	}
@@ -78,6 +78,11 @@ func ClusterUp(rkeConfig *v3.RancherKubernetesEngineConfig, dockerDialerFactory,
 		return APIURL, caCrt, clientCert, clientKey, err
 	}
 
+	err = kubeCluster.DeployWorkerPlane()
+	if err != nil {
+		return APIURL, caCrt, clientCert, clientKey, err
+	}
+
 	err = kubeCluster.DeployNetworkPlugin()
 	if err != nil {
 		return APIURL, caCrt, clientCert, clientKey, err