Merge branch 'master' into kubeconfig-tests

internal/run/initkube_test.go

@@ -33,10 +33,10 @@ namespace: {{ .Namespace }}
 		Certificate:  "CCNA",
 		Token:        "Aspire virtual currency",
 		TemplateFile: templateFile.Name(),
+		ConfigFile:   configFile.Name(),
 	}
 	cfg := Config{
-		Namespace:  "Cisco",
-		KubeConfig: configFile.Name(),
+		Namespace: "Cisco",
 	}
 	err = init.Prepare(cfg)
 	suite.Require().Nil(err)
@@ -63,10 +63,10 @@ func (suite *InitKubeTestSuite) TestExecuteGeneratesConfig() {
 	suite.Require().NoError(err)
 
 	cfg := Config{
-		KubeConfig: configFile.Name(),
-		Namespace:  "marshmallow",
+		Namespace: "marshmallow",
 	}
 	init := InitKube{
+		ConfigFile:     configFile.Name(),
 		TemplateFile:   "../../assets/kubeconfig.tpl", // the actual kubeconfig template
 		APIServer:      "https://kube.cluster/peanut",
 		ServiceAccount: "chef",
@@ -140,11 +140,10 @@ func (suite *InitKubeTestSuite) TestPrepareCannotOpenDestinationFile() {
 		Certificate:  "CCNA",
 		Token:        "Aspire virtual currency",
 		TemplateFile: templateFile.Name(),
+		ConfigFile:   "/usr/foreign/exclude/kubeprofig",
 	}
 
-	cfg := Config{
-		KubeConfig: "/usr/foreign/exclude/kubeprofig",
-	}
+	cfg := Config{}
 	err = init.Prepare(cfg)
 	suite.Error(err)
 	suite.Regexp("could not open .* for writing: .* no such file or directory", err)
@@ -165,11 +164,10 @@ func (suite *InitKubeTestSuite) TestPrepareRequiredConfig() {
 		Certificate:  "CCNA",
 		Token:        "Aspire virtual currency",
 		TemplateFile: templateFile.Name(),
+		ConfigFile:   configFile.Name(),
 	}
 
-	cfg := Config{
-		KubeConfig: configFile.Name(),
-	}
+	cfg := Config{}
 
 	suite.NoError(init.Prepare(cfg)) // consistency check; we should be starting in a happy state
 
@@ -195,11 +193,10 @@ func (suite *InitKubeTestSuite) TestPrepareDefaultsServiceAccount() {
 		Certificate:  "CCNA",
 		Token:        "Aspire virtual currency",
 		TemplateFile: templateFile.Name(),
+		ConfigFile:   configFile.Name(),
 	}
 
-	cfg := Config{
-		KubeConfig: configFile.Name(),
-	}
+	cfg := Config{}
 
 	init.Prepare(cfg)
 	suite.Equal("helm", init.ServiceAccount)