fix(kubeapiserver client):allow certificate validation to be skipped

Close: #8487

Signed-off-by: Dong Gang <dong.gang@daocloud.io>

cmd/helm/load_plugins.go

@@ -154,7 +154,7 @@ func callPluginExecutable(pluginName string, main string, argv []string, out io.
 func manuallyProcessArgs(args []string) ([]string, []string) {
 	known := []string{}
 	unknown := []string{}
-	kvargs := []string{"--kube-context", "--namespace", "-n", "--kubeconfig", "--kube-apiserver", "--kube-token", "--kube-as-user", "--kube-as-group", "--registry-config", "--repository-cache", "--repository-config"}
+	kvargs := []string{"--kube-context", "--namespace", "-n", "--kubeconfig", "--kube-apiserver", "--kube-token", "--kube-as-user", "--kube-as-group", "--kube-insecure-skip-tls-verify", "--registry-config", "--repository-cache", "--repository-config"}
 	knownArg := func(a string) bool {
 		for _, pre := range kvargs {
 			if strings.HasPrefix(a, pre+"=") {

pkg/cli/environment.go

@@ -54,6 +54,8 @@ type EnvSettings struct {
 	KubeAsGroups []string
 	// Kubernetes API Server Endpoint for authentication
 	KubeAPIServer string
+	// KubeInsecure indicates whether or not checking kubernetes apiserver's certificate
+	KubeInsecure bool
 	// Debug indicates whether or not Helm is running in Debug mode.
 	Debug bool
 	// RegistryConfig is the path to the registry config file.
@@ -77,6 +79,7 @@ func New() *EnvSettings {
 		KubeAsUser:       os.Getenv("HELM_KUBEASUSER"),
 		KubeAsGroups:     envCSV("HELM_KUBEASGROUPS"),
 		KubeAPIServer:    os.Getenv("HELM_KUBEAPISERVER"),
+		KubeInsecure:     envBoolOr("HELM_KUBEAPISERVER_INSECURE", false),
 		PluginsDirectory: envOr("HELM_PLUGINS", helmpath.DataPath("plugins")),
 		RegistryConfig:   envOr("HELM_REGISTRY_CONFIG", helmpath.ConfigPath("registry.json")),
 		RepositoryConfig: envOr("HELM_REPOSITORY_CONFIG", helmpath.ConfigPath("repositories.yaml")),
@@ -93,6 +96,7 @@ func New() *EnvSettings {
 		KubeConfig:       &env.KubeConfig,
 		Impersonate:      &env.KubeAsUser,
 		ImpersonateGroup: &env.KubeAsGroups,
+		Insecure:         &env.KubeInsecure,
 	}
 	return env
 }
@@ -106,6 +110,7 @@ func (s *EnvSettings) AddFlags(fs *pflag.FlagSet) {
 	fs.StringVar(&s.KubeAsUser, "kube-as-user", s.KubeAsUser, "Username to impersonate for the operation")
 	fs.StringArrayVar(&s.KubeAsGroups, "kube-as-group", s.KubeAsGroups, "Group to impersonate for the operation, this flag can be repeated to specify multiple groups.")
 	fs.StringVar(&s.KubeAPIServer, "kube-apiserver", s.KubeAPIServer, "the address and the port for the Kubernetes API server")
+	fs.BoolVar(&s.KubeInsecure, "kube-insecure-skip-tls-verify", s.KubeInsecure, "if true, the kubernetes apiserver's certificate will not be checked for validity. This will make your HTTPS connections insecure")
 	fs.BoolVar(&s.Debug, "debug", s.Debug, "enable verbose output")
 	fs.StringVar(&s.RegistryConfig, "registry-config", s.RegistryConfig, "path to the registry config file")
 	fs.StringVar(&s.RepositoryConfig, "repository-config", s.RepositoryConfig, "path to the file containing repository names and URLs")
@@ -139,6 +144,18 @@ func envCSV(name string) (ls []string) {
 	return
 }
 
+func envBoolOr(name string, def bool) bool {
+	if name == "" {
+		return def
+	}
+	envVal := envOr(name, strconv.FormatBool(def))
+	ret, err := strconv.ParseBool(envVal)
+	if err != nil {
+		return def
+	}
+	return ret
+}
+
 func (s *EnvSettings) EnvVars() map[string]string {
 	envvars := map[string]string{
 		"HELM_BIN":               os.Args[0],
@@ -154,11 +171,12 @@ func (s *EnvSettings) EnvVars() map[string]string {
 		"HELM_MAX_HISTORY":       strconv.Itoa(s.MaxHistory),
 
 		// broken, these are populated from helm flags and not kubeconfig.
-		"HELM_KUBECONTEXT":   s.KubeContext,
+		"HELM_KUBECONTEXT":            s.KubeContext,
-		"HELM_KUBETOKEN":     s.KubeToken,
+		"HELM_KUBETOKEN":              s.KubeToken,
-		"HELM_KUBEASUSER":    s.KubeAsUser,
+		"HELM_KUBEAPISERVER":          s.KubeAPIServer,
-		"HELM_KUBEASGROUPS":  strings.Join(s.KubeAsGroups, ","),
+		"HELM_KUBEASUSER":             s.KubeAsUser,
-		"HELM_KUBEAPISERVER": s.KubeAPIServer,
+		"HELM_KUBEASGROUPS":           strings.Join(s.KubeAsGroups, ","),
+		"HELM_KUBEAPISERVER_INSECURE": strconv.FormatBool(s.KubeInsecure),
 	}
 	if s.KubeConfig != "" {
 		envvars["KUBECONFIG"] = s.KubeConfig

pkg/cli/environment_test.go

@@ -39,6 +39,7 @@ func TestEnvSettings(t *testing.T) {
 		maxhistory   int
 		kAsUser      string
 		kAsGroups    []string
+		kubeInsecure bool
 	}{
 		{
 			name:       "defaults",
@@ -126,3 +127,55 @@ func resetEnv() func() {
 		}
 	}
 }
+
+func Test_envBoolOr(t *testing.T) {
+	type args struct {
+		name     string
+		envValue string
+		def      bool
+	}
+	tests := []struct {
+		name string
+		args args
+		want bool
+	}{
+		{
+			name: "empty name",
+			args: args{
+				name:     "",
+				envValue: "",
+				def:      true,
+			},
+			want: true,
+		},
+		{
+			name: "with ENV set",
+			args: args{
+				name:     "ENV",
+				envValue: "true",
+				def:      false,
+			},
+			want: true,
+		},
+		{
+			name: "with illegal ENV set",
+			args: args{
+				name:     "ENV",
+				envValue: "true1",
+				def:      true,
+			},
+			want: true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if tt.args.envValue != "" && tt.args.name != "" {
+				defer os.Unsetenv(tt.args.name)
+				os.Setenv(tt.args.name, tt.args.envValue)
+			}
+			if got := envBoolOr(tt.args.name, tt.args.def); got != tt.want {
+				t.Errorf("envBoolOr() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}