Merge pull request #792 from n2h9/chore-take-into-account-insecure-setting-from-kubeconfig-during-helm-apply

chore: helm: use setting from kubeconfig

Author: n2h9

utils/kubernetes/apply-helm-chart.go

@@ -412,16 +412,47 @@ func createHelmActionConfig(c *Client, cfg ApplyHelmChartConfig) (*action.Config
 	os.Setenv("HELM_DRIVER_SQL_CONNECTION_STRING", cfg.SQLConnectionString)
 
 	// KubeConfig setup
-	cafile, err := setDataAndReturnFileHandler(c.RestConfig.CAData)
-	if err != nil {
-		return nil, err
-	}
-	cafilename := cafile.Name()
-
 	kubeConfig := genericclioptions.NewConfigFlags(false)
 	kubeConfig.APIServer = &c.RestConfig.Host
-	kubeConfig.CAFile = &cafilename
 	kubeConfig.BearerToken = &c.RestConfig.BearerToken
+	kubeConfig.Insecure = &c.RestConfig.TLSClientConfig.Insecure
+
+	// Set username and password for basic auth if available
+	if c.RestConfig.Username != "" {
+		kubeConfig.Username = &c.RestConfig.Username
+	}
+	if c.RestConfig.Password != "" {
+		kubeConfig.Password = &c.RestConfig.Password
+	}
+
+	// Only set CA file if not running in insecure mode
+	if !c.RestConfig.TLSClientConfig.Insecure {
+		if len(c.RestConfig.CAData) > 0 {
+			caFileName, err := setDataAndReturnFilename(c.RestConfig.CAData)
+			if err != nil {
+				return nil, err
+			}
+			kubeConfig.CAFile = &caFileName
+		}
+	}
+
+	// Set client certificate data if available
+	if len(c.RestConfig.CertData) > 0 {
+		certFileName, err := setDataAndReturnFilename(c.RestConfig.CertData)
+		if err != nil {
+			return nil, err
+		}
+		kubeConfig.CertFile = &certFileName
+	}
+
+	// Set client key data if available
+	if len(c.RestConfig.KeyData) > 0 {
+		keyFileName, err := setDataAndReturnFilename(c.RestConfig.KeyData)
+		if err != nil {
+			return nil, err
+		}
+		kubeConfig.KeyFile = &keyFileName
+	}
 
 	actionConfig := new(action.Configuration)
 	if err := actionConfig.Init(kubeConfig, cfg.Namespace, string(cfg.HelmDriver), cfg.Logger); err != nil {
@@ -430,17 +461,21 @@ func createHelmActionConfig(c *Client, cfg ApplyHelmChartConfig) (*action.Config
 	return actionConfig, nil
 }
 
-// Populates a file in temp directory with the passed data and returns the data handler
-func setDataAndReturnFileHandler(data []byte) (*os.File, error) {
+// Populates a file in temp directory with the passed data and returns the filename
+func setDataAndReturnFilename(data []byte) (string, error) {
 	f, err := os.CreateTemp("", "")
 	if err != nil {
-		return nil, err
+		return "", err
 	}
+	defer f.Close() // Close file immediately after writing
+	
 	_, err = f.Write(data)
 	if err != nil {
-		return nil, err
+		os.Remove(f.Name()) // Clean up on write error
+		return "", err
 	}
-	return f, nil
+	
+	return f.Name(), nil
 }
 
 // generateAction generates an action function using action.Configuration