address comments

kubernetes-sigs · Aug 14, 2018 · b546f32 · b546f32
1 parent b576dd1
commit b546f32
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/clusterctl/clusterdeployer/clusterdeployer.go b/clusterctl/clusterdeployer/clusterdeployer.go
@@ -134,7 +134,7 @@ func (d *ClusterDeployer) Create(cluster *clusterv1.Cluster, machines []*cluster
 		return fmt.Errorf("unable to apply cluster api stack to external cluster: %v", err)
 	}
 
-	glog.Info("Provisioning cluster via external cluster")
+	glog.Info("Provisioning cluster via external (bootstrapping) cluster")
 
 	glog.Infof("Creating cluster object %v on external cluster", cluster.Name)
 	if err := externalClient.CreateClusterObject(cluster); err != nil {
@@ -155,10 +155,10 @@ func (d *ClusterDeployer) Create(cluster *clusterv1.Cluster, machines []*cluster
 	targetCluster := "external"
 
 	if d.pivotCluster {
-		glog.Info("Creating internal cluster")
-		internalClient, err := d.createInternalCluster(externalClient, provider, kubeconfigOutput)
+		glog.Info("Creating internal cluster client")
+		internalClient, err := d.createInternalClusterClient(externalClient, provider, kubeconfigOutput)
 		if err != nil {
-			return fmt.Errorf("unable to create internal cluster: %v", err)
+			return fmt.Errorf("unable to create internal cluster client: %v", err)
 		}
 		defer closeClient(internalClient, "internal")
 		targetClient = internalClient
@@ -244,7 +244,7 @@ func (d *ClusterDeployer) createExternalCluster() (ClusterClient, func(), error)
 		return nil, cleanupFn, fmt.Errorf("could not create external control plane: %v", err)
 	}
 
-	if d.cleanupExternalCluster {
+	if d.cleanupExternalCluster && d.pivotCluster {
 		cleanupFn = func() {
 			glog.Info("Cleaning up external cluster.")
 			d.externalProvisioner.Delete()
@@ -281,7 +281,7 @@ func (d *ClusterDeployer) retrieveKubeConfig(externalClient ClusterClient, provi
 	return provisionedKubeconfig, nil
 }
 
-func (d *ClusterDeployer) createInternalCluster(externalClient ClusterClient, provider ProviderDeployer, kubeconfigOutput string) (ClusterClient, error) {
+func (d *ClusterDeployer) createInternalClusterClient(externalClient ClusterClient, provider ProviderDeployer, kubeconfigOutput string) (ClusterClient, error) {
 	internalKubeconfig, err := d.retrieveKubeConfig(externalClient, provider, kubeconfigOutput)
 	if err != nil {
 		return nil, err