Merge pull request #6175 from jandubois/wsl-kubeconfig

Copy kubeconfig extra fields from Windows into WSL

src/go/wsl-helper/cmd/kubeconfig.go

@@ -102,11 +102,12 @@ var kubeconfigCmd = &cobra.Command{
 			return err
 		}
 		defer finalKubeConfigFile.Close()
-		err = yaml.NewEncoder(finalKubeConfigFile).Encode(kubeConfig)
+		encoder := yaml.NewEncoder(finalKubeConfigFile)
+		err = encoder.Encode(kubeConfig)
 		if err != nil {
 			return err
 		}
-		return nil
+		return encoder.Close()
 	},
 }
 
@@ -220,6 +221,13 @@ func mergeKubeConfigs(winConfig, linuxConfig kubeConfig) kubeConfig {
 		}
 	}
 
+	if linuxConfig.CurrentContext == "" {
+		linuxConfig.CurrentContext = rdCluster
+	}
+	if len(linuxConfig.Extras) == 0 {
+		linuxConfig.Extras = winConfig.Extras
+	}
+
 	return linuxConfig
 }