Refactor workflow

README.md

@@ -55,24 +55,24 @@ These instructions can be used for AWS:
     export PATH=$(pwd)/installer:$PATH
     ```
 
-4. Edit Tectonic configuration file including the $CLUSTER_NAME
+4. Edit Tectonic configuration file including
     ```shell
     $EDITOR examples/tectonic.aws.yaml
     ```
 
 5. Init Tectonic CLI
     ```shell
-    tectonic init --config=examples/tectonic.aws.yaml
+    tectonic init --config=examples/tectonic.aws.yaml --workspace=example
     ```
 
 6. Install Tectonic cluster
     ```shell
-    tectonic install --dir=$CLUSTER_NAME
+    tectonic install --workspace=example
     ```
 
 7. Teardown Tectonic cluster
     ```shell
-    tectonic destroy --dir=$CLUSTER_NAME
+    tectonic destroy --workspace=example
     ```
 
 #### Tests

installer/cmd/tectonic/main.go

@@ -10,18 +10,19 @@ import (
 )
 
 var (
-	clusterInitCommand    = kingpin.Command("init", "Initialize a new Tectonic cluster")
-	clusterInitConfigFlag = clusterInitCommand.Flag("config", "Cluster specification file").Required().ExistingFile()
+	clusterInitCommand           = kingpin.Command("init", "Initialize a new Tectonic cluster")
+	clusterInitConfigFlag        = clusterInitCommand.Flag("config", "Cluster specification file").Required().ExistingFile()
+	clusterInitWorkspaceNameFlag = clusterInitCommand.Flag("workspace", "Workspace folder name").Required().String()
 
 	clusterInstallCommand          = kingpin.Command("install", "Create a new Tectonic cluster")
 	clusterInstallAssetsCommand    = clusterInstallCommand.Command("assets", "Generate Tectonic assets.")
 	clusterInstallBootstrapCommand = clusterInstallCommand.Command("bootstrap", "Create a single bootstrap node Tectonic cluster.")
 	clusterInstallFullCommand      = clusterInstallCommand.Command("full", "Create a new Tectonic cluster").Default()
 	clusterInstallJoinCommand      = clusterInstallCommand.Command("join", "Create master and worker nodes to join an exisiting Tectonic cluster.")
-	clusterInstallDirFlag          = clusterInstallCommand.Flag("dir", "Cluster directory").Default(".").ExistingDir()
+	clusterInstallWorkspaceFlag    = clusterInstallCommand.Flag("workspace", "Workspace directory").Default(".").ExistingDir()
 
-	clusterDestroyCommand = kingpin.Command("destroy", "Destroy an existing Tectonic cluster")
-	clusterDestroyDirFlag = clusterDestroyCommand.Flag("dir", "Cluster directory").Default(".").ExistingDir()
+	clusterDestroyCommand       = kingpin.Command("destroy", "Destroy an existing Tectonic cluster")
+	clusterDestroyWorkspaceFlag = clusterDestroyCommand.Flag("workspace", "Workspace directory").Default(".").ExistingDir()
 
 	convertCommand    = kingpin.Command("convert", "Convert a tfvars.json to a Tectonic config.yaml")
 	convertConfigFlag = convertCommand.Flag("config", "tfvars.json file").Required().ExistingFile()
@@ -30,33 +31,48 @@ var (
 )
 
 func main() {
-	var w workflow.Workflow
+	var c *workflow.Cluster
+	var err error
+
+	newCluster := func(clusterInstallDirFlag string) *workflow.Cluster {
+		l, err := log.ParseLevel(*logLevel)
+		if err != nil {
+			// By definition we should never enter this condition since kingpin should be guarding against incorrect values.
+			log.Fatalf("invalid log-level: %v", err)
+		}
+		log.SetLevel(l)
+
+		c, err = workflow.NewCluster(clusterInstallDirFlag)
+		if err != nil {
+			log.Fatal(err)
+			os.Exit(1)
+		}
+		return c
+	}
 
 	switch kingpin.Parse() {
 	case clusterInitCommand.FullCommand():
-		w = workflow.NewInitWorkflow(*clusterInitConfigFlag)
+		err = workflow.InitWorkspace(*clusterInitConfigFlag, *clusterInitWorkspaceNameFlag)
 	case clusterInstallFullCommand.FullCommand():
-		w = workflow.NewInstallFullWorkflow(*clusterInstallDirFlag)
+		c = newCluster(*clusterInstallWorkspaceFlag)
+		err = c.Install()
 	case clusterInstallAssetsCommand.FullCommand():
-		w = workflow.NewInstallAssetsWorkflow(*clusterInstallDirFlag)
+		c = newCluster(*clusterInstallWorkspaceFlag)
+		err = c.Assets()
 	case clusterInstallBootstrapCommand.FullCommand():
-		w = workflow.NewInstallBootstrapWorkflow(*clusterInstallDirFlag)
+		c = newCluster(*clusterInstallWorkspaceFlag)
+		err = c.Bootstrap()
 	case clusterInstallJoinCommand.FullCommand():
-		w = workflow.NewInstallJoinWorkflow(*clusterInstallDirFlag)
+		c = newCluster(*clusterInstallWorkspaceFlag)
+		err = c.Scale()
 	case clusterDestroyCommand.FullCommand():
-		w = workflow.NewDestroyWorkflow(*clusterDestroyDirFlag)
+		c = newCluster(*clusterInstallWorkspaceFlag)
+		err = c.Destroy()
 	case convertCommand.FullCommand():
-		w = workflow.NewConvertWorkflow(*convertConfigFlag)
+		err = workflow.TF2YAML(*convertConfigFlag)
 	}
 
-	l, err := log.ParseLevel(*logLevel)
 	if err != nil {
-		// By definition we should never enter this condition since kingpin should be guarding against incorrect values.
-		log.Fatalf("invalid log-level: %v", err)
-	}
-	log.SetLevel(l)
-
-	if err := w.Execute(); err != nil {
 		log.Fatal(err)
 		os.Exit(1)
 	}

installer/pkg/config-generator/generator.go

@@ -7,6 +7,8 @@ import (
 	"errors"
 	"fmt"
 	"net"
+	"os"
+	"path/filepath"
 	"strings"
 
 	"github.com/apparentlymart/go-cidr/cidr"
@@ -33,6 +35,14 @@ const (
 	ingressConfigIngressKind      = "NodePort"
 	certificatesStrategy          = "userProvidedCA"
 	identityAPIService            = "tectonic-identity-api.tectonic-system.svc.cluster.local"
+
+	generatedPath          = "generated"
+	kcoConfigFileName      = "kco-config.yaml"
+	tncoConfigFileName     = "tnco-config.yaml"
+	kubeSystemPath         = "generated/manifests"
+	kubeSystemFileName     = "cluster-config.yaml"
+	tectonicSystemPath     = "generated/tectonic"
+	tectonicSystemFileName = "cluster-config.yaml"
 )
 
 // ConfigGenerator defines the cluster config generation for a cluster.
@@ -290,6 +300,62 @@ func marshalYAML(obj interface{}) (string, error) {
 	return string(data), nil
 }
 
+// GenerateClusterConfigMaps returns, if successful, the cluster kubernetes configMaps
+func (c ConfigGenerator) GenerateClusterConfigMaps(workspace string) error {
+	clusterGeneratedPath := filepath.Join(workspace, generatedPath)
+	if err := os.MkdirAll(clusterGeneratedPath, os.ModeDir|0755); err != nil {
+		return fmt.Errorf("Failed to create cluster generated directory at %s", clusterGeneratedPath)
+	}
+
+	kcoConfig, err := c.CoreConfig()
+	if err != nil {
+		return err
+	}
+
+	kcoConfigFilePath := filepath.Join(clusterGeneratedPath, kcoConfigFileName)
+	if err := writeFile(kcoConfigFilePath, kcoConfig); err != nil {
+		return err
+	}
+
+	tncoConfig, err := c.TncoConfig()
+	if err != nil {
+		return err
+	}
+
+	tncoConfigFilePath := filepath.Join(clusterGeneratedPath, tncoConfigFileName)
+	if err := writeFile(tncoConfigFilePath, tncoConfig); err != nil {
+		return err
+	}
+
+	kubeSystem, err := c.KubeSystem()
+	if err != nil {
+		return err
+	}
+
+	kubePath := filepath.Join(workspace, kubeSystemPath)
+	if err := os.MkdirAll(kubePath, os.ModeDir|0755); err != nil {
+		return fmt.Errorf("Failed to create manifests directory at %s", kubePath)
+	}
+
+	kubeSystemConfigFilePath := filepath.Join(kubePath, kubeSystemFileName)
+	if err := writeFile(kubeSystemConfigFilePath, kubeSystem); err != nil {
+		return err
+	}
+
+	tectonicSystem, err := c.TectonicSystem()
+	if err != nil {
+		return err
+	}
+
+	tectonicPath := filepath.Join(workspace, tectonicSystemPath)
+	if err := os.MkdirAll(tectonicPath, os.ModeDir|0755); err != nil {
+		return fmt.Errorf("Failed to create tectonic directory at %s", tectonicPath)
+	}
+
+	tectonicSystemConfigFilePath := filepath.Join(tectonicPath, tectonicSystemFileName)
+	return writeFile(tectonicSystemConfigFilePath, tectonicSystem)
+}
+
 func (c ConfigGenerator) getEtcdServersURLs() string {
 	if len(c.Cluster.Etcd.External.Servers) > 0 {
 		return strings.Join(c.Cluster.Etcd.External.Servers, ",")

installer/pkg/workflow/BUILD.bazel

@@ -4,8 +4,7 @@ go_test(
     name = "go_default_test",
     size = "small",
     srcs = [
-        "init_test.go",
-        "workflow_test.go",
+        "cluster_test.go",
     ],
     data = glob(["fixtures/**"]),
     embed = [":go_default_library"],
@@ -16,13 +15,10 @@ go_library(
     name = "go_default_library",
     srcs = [
         "convert.go",
-        "destroy.go",
         "executor.go",
-        "init.go",
-        "install.go",
         "terraform.go",
         "utils.go",
-        "workflow.go",
+        "cluster.go",
     ],
     importpath = "github.com/coreos/tectonic-installer/installer/pkg/workflow",
     visibility = ["//visibility:public"],