pkg/components/util: make HelmActionConfig take kubeconfig content

Instead of kubeconfig file path. This simplifies the tests and moves us closer towards resolving #608. Signed-off-by: Mateusz Gozdek <mateusz@kinvolk.io>
kinvolk · Jun 16, 2020 · 77a3429 · 77a3429
1 parent 4249278
commit 77a3429
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 60 deletions.
diff --git a/cli/cmd/cluster-apply.go b/cli/cmd/cluster-apply.go
@@ -85,15 +85,20 @@ func runClusterApply(cmd *cobra.Command, args []string) {
 		ctxLogger.Fatalf("Verify cluster: %v", err)
 	}
 
+	kubeconfigContent, err := ioutil.ReadFile(kubeconfigPath) // #nosec G304
+	if err != nil {
+		ctxLogger.Fatalf("Failed to read kubeconfig file: %q: %v", kubeconfigPath, err)
+	}
+
 	// Do controlplane upgrades only if cluster already exists and it is not a managed platform.
 	if exists && !p.Meta().Managed {
 		fmt.Printf("\nEnsuring that cluster controlplane is up to date.\n")
 
 		cu := controlplaneUpdater{
-			kubeconfigPath: kubeconfigPath,
-			assetDir:       assetDir,
-			ctxLogger:      *ctxLogger,
-			ex:             *ex,
+			kubeconfig: kubeconfigContent,
+			assetDir:   assetDir,
+			ctxLogger:  *ctxLogger,
+			ex:         *ex,
 		}
 
 		releases := []string{"pod-checkpointer", "kube-apiserver", "kubernetes", "calico"}

diff --git a/cli/cmd/cluster.go b/cli/cmd/cluster.go
@@ -148,10 +148,10 @@ func clusterExists(ctxLogger *logrus.Entry, ex *terraform.Executor) bool {
 }
 
 type controlplaneUpdater struct {
-	kubeconfigPath string
-	assetDir       string
-	ctxLogger      logrus.Entry
-	ex             terraform.Executor
+	kubeconfig []byte
+	assetDir   string
+	ctxLogger  logrus.Entry
+	ex         terraform.Executor
 }
 
 func (c controlplaneUpdater) getControlplaneChart(name string) (*chart.Chart, error) {
@@ -187,7 +187,7 @@ func (c controlplaneUpdater) upgradeComponent(component string) {
 		"component": component,
 	})
 
-	actionConfig, err := util.HelmActionConfig("kube-system", c.kubeconfigPath)
+	actionConfig, err := util.HelmActionConfig("kube-system", c.kubeconfig)
 	if err != nil {
 		ctxLogger.Fatalf("Failed initializing helm: %v", err)
 	}

diff --git a/pkg/components/util/install.go b/pkg/components/util/install.go
@@ -41,7 +41,12 @@ func InstallAsRelease(name string, c components.Component, kubeconfig string) er
 		return fmt.Errorf("component %s namespace is empty", name)
 	}
 
-	actionConfig, err := HelmActionConfig(ns, kubeconfig)
+	kubeconfigContent, err := ioutil.ReadFile(kubeconfig) // #nosec G304
+	if err != nil {
+		return fmt.Errorf("failed to read kubeconfig file %q: %v", kubeconfig, err)
+	}
+
+	actionConfig, err := HelmActionConfig(ns, kubeconfigContent)
 	if err != nil {
 		return fmt.Errorf("failed preparing helm client: %w", err)
 	}
@@ -100,15 +105,10 @@ func InstallAsRelease(name string, c components.Component, kubeconfig string) er
 }
 
 // HelmActionConfig creates initialized Helm action configuration.
-func HelmActionConfig(ns string, kubeconfig string) (*action.Configuration, error) {
+func HelmActionConfig(ns string, kubeconfig []byte) (*action.Configuration, error) {
 	actionConfig := &action.Configuration{}
 
-	kubeconfigContent, err := ioutil.ReadFile(kubeconfig) // #nosec G304
-	if err != nil {
-		return nil, fmt.Errorf("failed to read kubeconfig file %q: %v", kubeconfig, err)
-	}
-
-	getter, err := k8sutil.NewGetter(kubeconfigContent)
+	getter, err := k8sutil.NewGetter(kubeconfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create Kubernetes client getter: %v", err)
 	}
@@ -152,7 +152,12 @@ func UninstallComponent(c components.Component, kubeconfig string, deleteNSBool
 		panic(fmt.Errorf("component %s namespace is empty", name))
 	}
 
-	cfg, err := HelmActionConfig(ns, kubeconfig)
+	kubeconfigContent, err := ioutil.ReadFile(kubeconfig) // #nosec G304
+	if err != nil {
+		return fmt.Errorf("failed to read kubeconfig file %q: %v", kubeconfig, err)
+	}
+
+	cfg, err := HelmActionConfig(ns, kubeconfigContent)
 	if err != nil {
 		return fmt.Errorf("failed preparing helm client: %w", err)
 	}

diff --git a/pkg/components/util/install_test.go b/pkg/components/util/install_test.go
@@ -1,8 +1,6 @@
 package util_test
 
 import (
-	"io/ioutil"
-	"os"
 	"testing"
 
 	"github.com/kinvolk/lokomotive/pkg/components/util"
@@ -30,51 +28,13 @@ contexts:
 )
 
 func TestHelmActionConfigFromValidKubeconfigFile(t *testing.T) {
-	tmpFile, err := ioutil.TempFile("", "lokoctl-tests-")
-	if err != nil {
-		t.Fatalf("creating tmp file should succeed, got: %v", err)
-	}
-
-	defer func() {
-		if err := os.Remove(tmpFile.Name()); err != nil {
-			t.Logf("failed to remove tmp file %q: %v", tmpFile.Name(), err)
-		}
-	}()
-
-	if _, err := tmpFile.Write([]byte(validKubeconfig)); err != nil {
-		t.Fatalf("writing to tmp file %q should succeed, got: %v", tmpFile.Name(), err)
-	}
-
-	if err := tmpFile.Close(); err != nil {
-		t.Fatalf("closing tmp file %q should succeed, got: %v", tmpFile.Name(), err)
-	}
-
-	if _, err := util.HelmActionConfig("foo", tmpFile.Name()); err != nil {
+	if _, err := util.HelmActionConfig("foo", []byte(validKubeconfig)); err != nil {
 		t.Fatalf("creating helm action config from valid kubeconfig file should succeed, got: %v", err)
 	}
 }
 
 func TestHelmActionConfigFromInvalidKubeconfigFile(t *testing.T) {
-	tmpFile, err := ioutil.TempFile("", "lokoctl-tests-")
-	if err != nil {
-		t.Fatalf("creating tmp file should succeed, got: %v", err)
-	}
-
-	defer func() {
-		if err := os.Remove(tmpFile.Name()); err != nil {
-			t.Logf("failed to remove tmp file %q: %v", tmpFile.Name(), err)
-		}
-	}()
-
-	if _, err := tmpFile.Write([]byte("foo")); err != nil {
-		t.Fatalf("writing to tmp file %q should succeed, got: %v", tmpFile.Name(), err)
-	}
-
-	if err := tmpFile.Close(); err != nil {
-		t.Fatalf("closing tmp file %q should succeed, got: %v", tmpFile.Name(), err)
-	}
-
-	if _, err := util.HelmActionConfig("foo", tmpFile.Name()); err == nil {
+	if _, err := util.HelmActionConfig("foo", []byte("foo")); err == nil {
 		t.Fatalf("creating helm action config from invalid kubeconfig file should fail")
 	}
 }