Merge branch 'main' of https://github.com/adrianliechti/devkube into …

…feature/registry
adrianliechti · Sep 18, 2022 · 353e30b · 353e30b
2 parents 0adfc78 + 75e7810
commit 353e30b
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 33 deletions.
diff --git a/app/cluster/cluster_create.go b/app/cluster/cluster_create.go
@@ -2,7 +2,7 @@ package cluster
 
 import (
 	"os"
-	"path"
+	"path/filepath"
 
 	"github.com/adrianliechti/devkube/app"
 	"github.com/adrianliechti/devkube/pkg/cli"
@@ -55,12 +55,14 @@ func CreateCommand() *cli.Command {
 
 			defer os.RemoveAll(dir)
 
-			kubeconfig := path.Join(dir, "kubeconfig")
+			kubeconfig := filepath.Join(dir, "kubeconfig")
 
 			if err := provider.Create(c.Context, cluster, kubeconfig); err != nil {
 				return err
 			}
 
+			kubectl.Invoke(c.Context, []string{"create", "namespace", DefaultNamespace}, kubectl.WithKubeconfig(kubeconfig))
+
 			if err := observability.InstallCRD(c.Context, kubeconfig, DefaultNamespace); err != nil {
 				return err
 			}

diff --git a/app/flag_cluster.go b/app/flag_cluster.go
@@ -3,7 +3,7 @@ package app
 import (
 	"errors"
 	"os"
-	"path"
+	"path/filepath"
 	"strings"
 
 	"github.com/adrianliechti/devkube/pkg/cli"
@@ -150,7 +150,7 @@ func MustClusterKubeconfig(c *cli.Context, provider provider.Provider, name stri
 		os.RemoveAll(dir)
 	}
 
-	path := path.Join(dir, "kubeconfig")
+	path := filepath.Join(dir, "kubeconfig")
 
 	if err := provider.Export(c.Context, name, path); err != nil {
 		closer()

diff --git a/extension/certmanager/certmanager.go b/extension/certmanager/certmanager.go
@@ -14,8 +14,8 @@ import (
 )
 
 const (
-	certmanagerRepo       = "https://charts.jetstack.io"
-	certmanagerNamespace1 = "cert-manager"
+	certmanagerRepo      = "https://charts.jetstack.io"
+	certmanagerNamespace = "cert-manager"
 
 	certmanager        = "cert-manager"
 	certmanagerChart   = "cert-manager"
@@ -28,11 +28,9 @@ var (
 )
 
 func Install(ctx context.Context, kubeconfig, namespace string) error {
-	// if namespace == "" {
-	// 	namespace = "default"
-	// }
-
-	namespace = certmanagerNamespace1
+	if namespace == "" {
+		namespace = "default"
+	}
 
 	client, err := kubernetes.NewFromConfig(kubeconfig)
 
@@ -63,7 +61,7 @@ func Install(ctx context.Context, kubeconfig, namespace string) error {
 		}
 	}
 
-	if err := helm.Install(ctx, certmanager, certmanagerRepo, certmanagerChart, certmanagerVersion, values, helm.WithKubeconfig(kubeconfig), helm.WithNamespace(namespace), helm.WithWait(true), helm.WithDefaultOutput()); err != nil {
+	if err := helm.Install(ctx, certmanager, certmanagerRepo, certmanagerChart, certmanagerVersion, values, helm.WithKubeconfig(kubeconfig), helm.WithNamespace(certmanagerNamespace), helm.WithWait(true), helm.WithDefaultOutput()); err != nil {
 		return err
 	}
 
@@ -75,17 +73,15 @@ func Install(ctx context.Context, kubeconfig, namespace string) error {
 }
 
 func Uninstall(ctx context.Context, kubeconfig, namespace string) error {
-	// if namespace == "" {
-	// 	namespace = "default"
-	// }
-
-	namespace = certmanagerNamespace1
+	if namespace == "" {
+		namespace = "default"
+	}
 
 	if err := kubectl.Invoke(ctx, []string{"delete", "-f", "-"}, kubectl.WithKubeconfig(kubeconfig), kubectl.WithNamespace(namespace), kubectl.WithInput(strings.NewReader(manifest)), kubectl.WithDefaultOutput()); err != nil {
 		// return err
 	}
 
-	if err := helm.Uninstall(ctx, certmanager, helm.WithKubeconfig(kubeconfig), helm.WithNamespace(namespace)); err != nil {
+	if err := helm.Uninstall(ctx, certmanager, helm.WithKubeconfig(kubeconfig), helm.WithNamespace(certmanagerNamespace)); err != nil {
 		//return err
 	}
 

diff --git a/extension/certmanager/manifest.yaml b/extension/certmanager/manifest.yaml
@@ -1,12 +1,12 @@
 apiVersion: cert-manager.io/v1
-kind: ClusterIssuer
+kind: Issuer
 metadata:
   name: selfsigned
 spec:
   selfSigned: {}
 ---
 apiVersion: cert-manager.io/v1
-kind: ClusterIssuer
+kind: Issuer
 metadata:
   name: platform
 spec:
@@ -27,7 +27,7 @@ spec:
     size: 256
   issuerRef:
     name: selfsigned
-    kind: ClusterIssuer
+    kind: Issuer
     group: cert-manager.io
 ---
 apiVersion: apps/v1

diff --git a/provider/azure/azure.go b/provider/azure/azure.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"os"
-	"path"
+	"path/filepath"
 	"strings"
 
 	"github.com/adrianliechti/devkube/pkg/to"
@@ -200,13 +200,13 @@ func (p *Provider) Export(ctx context.Context, name, kubeconfig string) error {
 			return err
 		}
 
-		dir := path.Join(home, ".kube")
+		dir := filepath.Join(home, ".kube")
 
 		if err := os.MkdirAll(dir, 0700); err != nil {
 			return err
 		}
 
-		kubeconfig = path.Join(home, ".kube", "config")
+		kubeconfig = filepath.Join(home, ".kube", "config")
 	}
 
 	resourcegroup := groupName(name)

diff --git a/provider/digitalocean/digitalocean.go b/provider/digitalocean/digitalocean.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"path"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -150,13 +150,13 @@ func (p *Provider) Export(ctx context.Context, name, kubeconfig string) error {
 			return err
 		}
 
-		dir := path.Join(home, ".kube")
+		dir := filepath.Join(home, ".kube")
 
 		if err := os.MkdirAll(dir, 0700); err != nil {
 			return err
 		}
 
-		kubeconfig = path.Join(home, ".kube", "config")
+		kubeconfig = filepath.Join(home, ".kube", "config")
 	}
 
 	id, err := p.clusterID(ctx, name)

diff --git a/provider/linode/linode.go b/provider/linode/linode.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"path"
+	"path/filepath"
 	"strings"
 
 	"github.com/linode/linodego"
@@ -158,13 +158,13 @@ func writeKubeconfig(kubeconfig string, config *linodego.LKEClusterKubeconfig) e
 			return err
 		}
 
-		dir := path.Join(home, ".kube")
+		dir := filepath.Join(home, ".kube")
 
 		if err := os.MkdirAll(dir, 0700); err != nil {
 			return err
 		}
 
-		kubeconfig = path.Join(home, ".kube", "config")
+		kubeconfig = filepath.Join(home, ".kube", "config")
 	}
 
 	data, err := base64.StdEncoding.DecodeString(config.KubeConfig)

diff --git a/provider/vultr/vultr.go b/provider/vultr/vultr.go
@@ -7,7 +7,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
-	"path"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -171,13 +171,13 @@ func writeKubeconfig(kubeconfig string, config *govultr.KubeConfig) error {
 			return err
 		}
 
-		dir := path.Join(home, ".kube")
+		dir := filepath.Join(home, ".kube")
 
 		if err := os.MkdirAll(dir, 0700); err != nil {
 			return err
 		}
 
-		kubeconfig = path.Join(home, ".kube", "config")
+		kubeconfig = filepath.Join(home, ".kube", "config")
 	}
 
 	data, err := base64.StdEncoding.DecodeString(config.KubeConfig)