[#1041] Restructure cli for building providers (#1159)

docs/docs/cli/reference.md

@@ -94,8 +94,9 @@ airy create [flags]
 #### Options
 
 ```
-  -h, --help              help for create
-      --provider string   One of the supported providers (aws|local|minikube). Default is aws (default "local")
+  -h, --help               help for create
+      --namespace string   (optional) Kubernetes namespace that Airy should be installed to. (default "default")
+      --provider string    One of the supported providers (aws|local|minikube). (default "local")
 ```
 
 #### Options inherited from parent commands

infrastructure/cli/pkg/cmd/create/BUILD

@@ -18,6 +18,9 @@ go_library(
     ],
     importpath = "cli/pkg/cmd/create",
     visibility = ["//visibility:public"],
+    x_defs = {
+        "version": "{STABLE_VERSION}",
+    },
     deps = [
         "//infrastructure/cli/pkg/providers",
         "@com_github_spf13_cobra//:cobra",

infrastructure/cli/pkg/cmd/create/create.go

@@ -8,9 +8,10 @@ import (
 )
 
 var (
-	provider   string
-	version    string
-	CreateCmd  = &cobra.Command{
+	provider  string
+	namespace string
+	version   string
+	CreateCmd = &cobra.Command{
 		Use:   "create",
 		Short: "Creates an instance of Airy Core",
 		Long:  ``,
@@ -19,21 +20,30 @@ var (
 )
 
 func init() {
-	CreateCmd.Flags().StringVar(&provider, "provider", "local", "One of the supported providers (aws|local|minikube). Default is aws")
+	CreateCmd.Flags().StringVar(&provider, "provider", "local", "One of the supported providers (aws|local|minikube).")
+	CreateCmd.Flags().StringVar(&namespace, "namespace", "default", "(optional) Kubernetes namespace that Airy should be installed to.")
 	CreateCmd.MarkFlagRequired("provider")
 
 }
 
 func create(cmd *cobra.Command, args []string) {
 	fmt.Println("⚙️  Creating core with provider", provider)
 
-	clientset, err := providers.GetProvider(providers.Provider(provider))
+	provider := providers.MustGet(providers.ProviderName(provider))
+
+	context, err := provider.Provision()
+	if err != nil {
+		fmt.Println("could not provision cluster: ", err)
+		os.Exit(1)
+	}
+
+	clientset, err := context.GetClientSet()
 	if err != nil {
-		fmt.Println("provisioning cluster failed: ", err)
+		fmt.Println("could not get clientset: ", err)
 		os.Exit(1)
 	}
 
-	helm := New(clientset, "develop", "default")
+	helm := New(clientset, version, namespace)
 	if err := helm.Setup(); err != nil {
 		fmt.Println("setting up Helm failed with err: ", err)
 		os.Exit(1)

infrastructure/cli/pkg/kube/BUILD

@@ -0,0 +1,12 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "kube",
+    srcs = ["context.go"],
+    importpath = "cli/pkg/kube",
+    visibility = ["//visibility:public"],
+    deps = [
+        "@io_k8s_client_go//kubernetes:go_default_library",
+        "@io_k8s_client_go//tools/clientcmd:go_default_library",
+    ],
+)

infrastructure/cli/pkg/kube/context.go

@@ -0,0 +1,41 @@
+package kube
+
+import (
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/tools/clientcmd"
+)
+
+type KubeCtx struct {
+	kubeConfigPath string
+	contextName string
+}
+
+func New(kubeConfigPath, contextName string) KubeCtx {
+	return KubeCtx{
+		kubeConfigPath: kubeConfigPath,
+		contextName: contextName,
+	}
+}
+
+func (c *KubeCtx) GetClientSet() (*kubernetes.Clientset, error) {
+	if c.contextName == "" {
+		config, err := clientcmd.BuildConfigFromFlags("", c.kubeConfigPath)
+		if err != nil {
+			return nil, err
+		}
+
+		return kubernetes.NewForConfig(config)
+	}
+
+	file, err := clientcmd.LoadFromFile(c.kubeConfigPath)
+	if err != nil {
+		return nil, err
+	}
+
+	config, err := clientcmd.NewNonInteractiveClientConfig(*file, c.contextName, nil, nil).ClientConfig()
+	if err != nil {
+		return nil, err
+	}
+
+	return kubernetes.NewForConfig(config)
+}

infrastructure/cli/pkg/providers/BUILD

@@ -2,13 +2,12 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
     name = "providers",
-    srcs = ["providers.go"],
+    srcs = ["provider.go"],
     importpath = "cli/pkg/providers",
     visibility = ["//visibility:public"],
     deps = [
+        "//infrastructure/cli/pkg/kube",
         "//infrastructure/cli/pkg/providers/aws",
         "//infrastructure/cli/pkg/providers/minikube",
-        "@io_k8s_client_go//kubernetes:go_default_library",
-        "@io_k8s_client_go//tools/clientcmd:go_default_library",
     ],
 )

infrastructure/cli/pkg/providers/aws/BUILD

@@ -5,5 +5,5 @@ go_library(
     srcs = ["aws.go"],
     importpath = "cli/pkg/providers/aws",
     visibility = ["//visibility:public"],
-    deps = ["@io_k8s_client_go//kubernetes:go_default_library"],
+    deps = ["//infrastructure/cli/pkg/kube"],
 )

infrastructure/cli/pkg/providers/aws/aws.go

@@ -1,14 +1,18 @@
 package aws
 
 import (
+	"cli/pkg/kube"
 	"fmt"
-	"k8s.io/client-go/kubernetes"
 	"os"
 )
 
+type Aws struct {
+}
 
-func Create() (*kubernetes.Clientset, error) {
-	fmt.Println("aws provider not yet implemented")
+func (a *Aws) Provision() (kube.KubeCtx, error) {
+	// Use this to
+	//clientcmd.NewNonInteractiveClientConfig()
+	fmt.Println("minikube provider not yet implemented")
 	os.Exit(1)
-	return nil, nil
+	return kube.KubeCtx{}, nil
 }

infrastructure/cli/pkg/providers/minikube/BUILD

@@ -5,5 +5,5 @@ go_library(
     srcs = ["minikube.go"],
     importpath = "cli/pkg/providers/minikube",
     visibility = ["//visibility:public"],
-    deps = ["@io_k8s_client_go//kubernetes:go_default_library"],
+    deps = ["//infrastructure/cli/pkg/kube"],
 )

infrastructure/cli/pkg/providers/minikube/minikube.go

@@ -1,14 +1,20 @@
 package minikube
 
 import (
+	"cli/pkg/kube"
 	"fmt"
-	"k8s.io/client-go/kubernetes"
 	"os"
 )
 
-func Create() (*kubernetes.Clientset, error) {
+type Minikube struct {
+}
+
+func (m *Minikube) Provision() (kube.KubeCtx, error) {
+	// Use this to
+	//clientcmd.NewNonInteractiveClientConfig()
 	fmt.Println("minikube provider not yet implemented")
 	os.Exit(1)
-	return nil, nil
+	return kube.KubeCtx{}, nil
 }
 
+

infrastructure/cli/pkg/providers/provider.go

@@ -0,0 +1,46 @@
+package providers
+
+import (
+	"cli/pkg/kube"
+	"cli/pkg/providers/aws"
+	"cli/pkg/providers/minikube"
+	"fmt"
+	"os"
+)
+
+type ProviderName string
+
+const (
+	Local    ProviderName = "local"
+	Minikube ProviderName = "minikube"
+	Aws      ProviderName = "aws"
+)
+
+type Provider interface {
+	Provision() (kube.KubeCtx, error)
+}
+
+func MustGet(providerName ProviderName) Provider {
+	if providerName == Minikube {
+		return &minikube.Minikube{}
+	}
+
+	if providerName == Aws {
+		return &aws.Aws{}
+	}
+
+	// TODO remove this provider in #1041
+	if providerName == Local {
+		return &LocalProvider{}
+	}
+
+	panic(fmt.Sprintf("unknown provider \"%v\"", providerName))
+}
+
+// TODO remove this provider in #1041
+type LocalProvider struct {
+}
+
+func (l *LocalProvider) Provision() (kube.KubeCtx, error) {
+	return kube.New(os.Getenv("KUBE_CONFIG_PATH"), ""), nil
+}