Merge pull request #1421 from justinsb/harmonious_create

Use update cluster from create cluster

Author: justinsb

Diff for: cmd/kops/create_cluster.go

@@ -32,7 +32,6 @@ import (
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/upup/pkg/fi/cloudup"
 	"k8s.io/kops/upup/pkg/fi/utils"
-	"k8s.io/kops/upup/pkg/kutil"
 	"sort"
 )
 
@@ -586,11 +585,6 @@ func RunCreateCluster(f *util.Factory, out io.Writer, c *CreateClusterOptions) e
 		return err
 	}
 
-	secretStore, err := registry.SecretStore(cluster)
-	if err != nil {
-		return err
-	}
-
 	err = registry.WriteConfigDeprecated(configBase.Join(registry.PathClusterCompleted), fullCluster)
 	if err != nil {
 		return fmt.Errorf("error writing completed cluster spec: %v", err)
@@ -605,19 +599,26 @@ func RunCreateCluster(f *util.Factory, out io.Writer, c *CreateClusterOptions) e
 
 	if targetName != "" {
 		if isDryrun {
-			fmt.Print("Previewing changes that will be made:\n\n")
+			fmt.Fprintf(out, "Previewing changes that will be made:\n\n")
 		}
 
-		applyCmd := &cloudup.ApplyClusterCmd{
-			Cluster:    fullCluster,
-			Models:     strings.Split(c.Models, ","),
-			Clientset:  clientset,
-			TargetName: targetName,
-			OutDir:     c.OutDir,
-			DryRun:     isDryrun,
-		}
+		// TODO: Maybe just embed UpdateClusterOptions in CreateClusterOptions?
+		updateClusterOptions := &UpdateClusterOptions{}
+		updateClusterOptions.InitDefaults()
+
+		updateClusterOptions.Yes = c.Yes
+		updateClusterOptions.Target = c.Target
+		updateClusterOptions.Models = c.Models
+		updateClusterOptions.OutDir = c.OutDir
+
+		// SSHPublicKey has already been mapped
+		updateClusterOptions.SSHPublicKey = ""
 
-		err = applyCmd.Run()
+		// No equivalent options:
+		//  updateClusterOptions.MaxTaskDuration = c.MaxTaskDuration
+		//  updateClusterOptions.CreateKubecfg = c.CreateKubecfg
+
+		err := RunUpdateCluster(f, clusterName, out, updateClusterOptions)
 		if err != nil {
 			return err
 		}
@@ -644,20 +645,6 @@ func RunCreateCluster(f *util.Factory, out io.Writer, c *CreateClusterOptions) e
 			if err != nil {
 				return fmt.Errorf("error writing to output: %v", err)
 			}
-		} else {
-			glog.Infof("Exporting kubecfg for cluster")
-
-			x := &kutil.CreateKubecfg{
-				ContextName:  cluster.ObjectMeta.Name,
-				KeyStore:     keyStore,
-				SecretStore:  secretStore,
-				KubeMasterIP: cluster.Spec.MasterPublicName,
-			}
-
-			err = x.WriteKubecfg()
-			if err != nil {
-				return err
-			}
 		}
 	}
 

Diff for: cmd/kops/update_cluster.go

@@ -17,6 +17,7 @@ limitations under the License.
 package main
 
 import (
+	"bytes"
 	"fmt"
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
@@ -163,9 +164,9 @@ func RunUpdateCluster(f *util.Factory, clusterName string, out io.Writer, c *Upd
 	if isDryrun {
 		target := applyCmd.Target.(*fi.DryRunTarget)
 		if target.HasChanges() {
-			fmt.Printf("Must specify --yes to apply changes\n")
+			fmt.Fprintf(out, "Must specify --yes to apply changes\n")
 		} else {
-			fmt.Printf("No changes need to be applied\n")
+			fmt.Fprintf(out, "No changes need to be applied\n")
 		}
 		return nil
 	}
@@ -202,29 +203,36 @@ func RunUpdateCluster(f *util.Factory, clusterName string, out io.Writer, c *Upd
 		}
 
 		if !hasKubecfg {
+			sb := new(bytes.Buffer)
+
 			// Assume initial creation
 			if c.Target == cloudup.TargetTerraform {
-				fmt.Printf("\n")
-				fmt.Printf("Terraform output has been placed into %s\n", c.OutDir)
-				fmt.Printf("Run these commands to apply the configuration:\n")
-				fmt.Printf("   cd %s\n", c.OutDir)
-				fmt.Printf("   terraform plan\n")
-				fmt.Printf("   terraform apply\n")
-				fmt.Printf("\n")
+				fmt.Fprintf(sb, "\n")
+				fmt.Fprintf(sb, "Terraform output has been placed into %s\n", c.OutDir)
+				fmt.Fprintf(sb, "Run these commands to apply the configuration:\n")
+				fmt.Fprintf(sb, "   cd %s\n", c.OutDir)
+				fmt.Fprintf(sb, "   terraform plan\n")
+				fmt.Fprintf(sb, "   terraform apply\n")
+				fmt.Fprintf(sb, "\n")
 			} else {
-				fmt.Printf("\n")
-				fmt.Printf("Cluster is starting.  It should be ready in a few minutes.\n")
-				fmt.Printf("\n")
+				fmt.Fprintf(sb, "\n")
+				fmt.Fprintf(sb, "Cluster is starting.  It should be ready in a few minutes.\n")
+				fmt.Fprintf(sb, "\n")
 			}
-			fmt.Printf("Suggestions:\n")
-			fmt.Printf(" * list nodes: kubectl get nodes --show-labels\n")
+			fmt.Fprintf(sb, "Suggestions:\n")
+			fmt.Fprintf(sb, " * list nodes: kubectl get nodes --show-labels\n")
 			if cluster.Spec.Topology.Masters == kops.TopologyPublic {
-				fmt.Printf(" * ssh to the master: ssh -i ~/.ssh/id_rsa admin@%s\n", cluster.Spec.MasterPublicName)
+				fmt.Fprintf(sb, " * ssh to the master: ssh -i ~/.ssh/id_rsa admin@%s\n", cluster.Spec.MasterPublicName)
 			} else {
-				fmt.Printf(" * ssh to the bastion: ssh -i ~/.ssh/id_rsa admin@%s\n", cluster.Spec.MasterPublicName)
+				fmt.Fprintf(sb, " * ssh to the bastion: ssh -i ~/.ssh/id_rsa admin@%s\n", cluster.Spec.MasterPublicName)
+			}
+			fmt.Fprintf(sb, " * read about installing addons: https://github.com/kubernetes/kops/blob/master/docs/addons.md\n")
+			fmt.Fprintf(sb, "\n")
+
+			_, err := out.Write(sb.Bytes())
+			if err != nil {
+				return fmt.Errorf("error writing to output: %v", err)
 			}
-			fmt.Printf(" * read about installing addons: https://github.com/kubernetes/kops/blob/master/docs/addons.md\n")
-			fmt.Printf("\n")
 		}
 	}