Merge pull request #14 from galal-hussein/fix_race_condition

Fix race condition
rancher · Nov 15, 2017 · 43eb1c2 · 43eb1c2
2 parents 1fd6129 + f9b1173
commit 43eb1c2
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/cmd/cluster.go b/cmd/cluster.go
@@ -77,20 +77,21 @@ func ClusterUp(clusterFile string) (string, string, string, string, error) {
 		return APIURL, caCrt, clientCert, clientKey, err
 	}
 
-	err = kubeCluster.DeployNetworkPlugin()
+	err = kubeCluster.SaveClusterState(clusterFile)
 	if err != nil {
 		return APIURL, caCrt, clientCert, clientKey, err
 	}
 
-	err = kubeCluster.DeployK8sAddOns()
+	err = kubeCluster.DeployNetworkPlugin()
 	if err != nil {
 		return APIURL, caCrt, clientCert, clientKey, err
 	}
 
-	err = kubeCluster.SaveClusterState(clusterFile)
+	err = kubeCluster.DeployK8sAddOns()
 	if err != nil {
 		return APIURL, caCrt, clientCert, clientKey, err
 	}
+
 	APIURL = fmt.Sprintf("https://" + kubeCluster.ControlPlaneHosts[0].IP + ":6443")
 	caCrt = string(cert.EncodeCertPEM(kubeCluster.Certificates[pki.CACertName].Certificate))
 	clientCert = string(cert.EncodeCertPEM(kubeCluster.Certificates[pki.KubeAdminCommonName].Certificate))