Add apply to example

Makefile

@@ -1,6 +1,6 @@
 all: kops
 
-.PHONY: channels
+.PHONY: channels examples
 
 DOCKER_REGISTRY?=gcr.io/must-override
 S3_BUCKET?=s3://must-override/
@@ -194,3 +194,8 @@ channels: channels-gocode
 channels-gocode:
 	go install ${EXTRA_BUILDFLAGS} -ldflags "-X main.BuildVersion=${VERSION} ${EXTRA_LDFLAGS}" k8s.io/kops/channels/cmd/channels
 
+# --------------------------------------------------
+# API / embedding examples
+
+examples:
+	go install k8s.io/kops/examples/kops-api-example/...

cmd/kops/update_cluster.go

@@ -41,7 +41,7 @@ func init() {
 
 	cmd.Flags().BoolVar(&updateCluster.Yes, "yes", false, "Actually create cloud resources")
 	cmd.Flags().StringVar(&updateCluster.Target, "target", "direct", "Target - direct, terraform")
-	cmd.Flags().StringVar(&updateCluster.Models, "model", "config,proto,cloudup", "Models to apply (separate multiple models with commas)")
+	cmd.Flags().StringVar(&updateCluster.Models, "model", strings.Join(cloudup.CloudupModels, ","), "Models to apply (separate multiple models with commas)")
 	cmd.Flags().StringVar(&updateCluster.SSHPublicKey, "ssh-public-key", "", "SSH public key to use (deprecated: use kops create secret instead)")
 	cmd.Flags().StringVar(&updateCluster.OutDir, "out", "", "Path to write any local output")
 }

examples/README.md

@@ -0,0 +1,11 @@
+## Examples of how to embed kops / use the kops API
+
+The kops API is still a work in progress, but this is where we will put examples of how it can be used.
+
+```
+make examples
+```
+
+```
+kops-api-example -name api1.example.com -zones us-east-1c
+```

examples/kops-api-example/apply.go

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"k8s.io/kops/pkg/client/simple/vfsclientset"
+	"k8s.io/kops/upup/pkg/fi/cloudup"
+)
+
+func apply() error {
+	clientset := vfsclientset.NewVFSClientset(registryBase)
+
+	cluster, err := clientset.Clusters().Get(clusterName)
+	if err != nil {
+		return err
+	}
+
+	applyCmd := &cloudup.ApplyClusterCmd{
+		Cluster:    cluster,
+		Clientset:  clientset,
+		TargetName: cloudup.TargetDirect,
+	}
+	err = applyCmd.Run()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

examples/kops-api-example/main.go

@@ -36,7 +36,13 @@ func main() {
 
 	err = up()
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
+		fmt.Fprintf(os.Stderr, "error from up: %v\n", err)
+		os.Exit(1)
+	}
+
+	err = apply()
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "error from apply: %v\n", err)
 		os.Exit(1)
 	}
 }

upup/pkg/fi/cloudup/apply_cluster.go

@@ -28,6 +28,8 @@ const (
 
 const MaxAttemptsWithNoProgress = 3
 
+var CloudupModels = []string{"config","proto","cloudup"}
+
 type ApplyClusterCmd struct {
 	Cluster *api.Cluster
 
@@ -73,6 +75,10 @@ func (c *ApplyClusterCmd) Run() error {
 		c.InstanceGroups = instanceGroups
 	}
 
+	if c.Models == nil {
+		c.Models = CloudupModels
+	}
+
 	modelStore, err := findModelStore()
 	if err != nil {
 		return err