Remove implicit support for KUBECONFIG (#604)

.github/workflows/tests.yaml

@@ -21,4 +21,4 @@ jobs:
     - uses: engineerd/setup-kind@v0.3.0
     - name: Acceptance Tests
       run: |
-        make testacc 
+        make testacc KUBE_CONFIG_PATH="${HOME}/.kube/config"

helm/provider.go

@@ -163,15 +163,10 @@ func kubernetesResource() *schema.Resource {
 				Description: "PEM-encoded root certificates bundle for TLS authentication.",
 			},
 			"config_path": {
-				Type:     schema.TypeString,
-				Optional: true,
-				DefaultFunc: schema.MultiEnvDefaultFunc(
-					[]string{
-						"KUBE_CONFIG",
-						"KUBECONFIG",
-					},
-					"~/.kube/config"),
-				Description: "Path to the kube config file, defaults to ~/.kube/config",
+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("KUBE_CONFIG_PATH", ""),
+				Description: "Path to the kube config file. Can be set with KUBE_CONFIG_PATH environment variable.",
 			},
 			"config_context": {
 				Type:        schema.TypeString,
@@ -196,12 +191,6 @@ func kubernetesResource() *schema.Resource {
 				DefaultFunc: schema.EnvDefaultFunc("KUBE_TOKEN", ""),
 				Description: "Token to authenticate an service account",
 			},
-			"load_config_file": {
-				Type:        schema.TypeBool,
-				Optional:    true,
-				DefaultFunc: schema.EnvDefaultFunc("KUBE_LOAD_CONFIG_FILE", true),
-				Description: "Load local kubeconfig.",
-			},
 			"exec": {
 				Type:     schema.TypeList,
 				Optional: true,

helm/structure_kubeconfig.go

@@ -67,32 +67,30 @@ func newKubeConfig(configData *schema.ResourceData, namespace *string) *KubeConf
 	overrides := &clientcmd.ConfigOverrides{}
 	loader := &clientcmd.ClientConfigLoadingRules{}
 
-	if k8sGet(configData, "load_config_file").(bool) {
-		if configPath, ok := k8sGetOk(configData, "config_path"); ok && configPath.(string) != "" {
-			path, err := homedir.Expand(configPath.(string))
-			if err != nil {
-				return nil
+	if configPath, ok := k8sGetOk(configData, "config_path"); ok && configPath.(string) != "" {
+		path, err := homedir.Expand(configPath.(string))
+		if err != nil {
+			return nil
+		}
+		loader.ExplicitPath = path
+
+		ctx, ctxOk := k8sGetOk(configData, "config_context")
+		authInfo, authInfoOk := k8sGetOk(configData, "config_context_auth_info")
+		cluster, clusterOk := k8sGetOk(configData, "config_context_cluster")
+		if ctxOk || authInfoOk || clusterOk {
+			if ctxOk {
+				overrides.CurrentContext = ctx.(string)
+				log.Printf("[DEBUG] Using custom current context: %q", overrides.CurrentContext)
+			}
+
+			overrides.Context = clientcmdapi.Context{}
+			if authInfoOk {
+				overrides.Context.AuthInfo = authInfo.(string)
 			}
-			loader.ExplicitPath = path
-
-			ctx, ctxOk := k8sGetOk(configData, "config_context")
-			authInfo, authInfoOk := k8sGetOk(configData, "config_context_auth_info")
-			cluster, clusterOk := k8sGetOk(configData, "config_context_cluster")
-			if ctxOk || authInfoOk || clusterOk {
-				if ctxOk {
-					overrides.CurrentContext = ctx.(string)
-					log.Printf("[DEBUG] Using custom current context: %q", overrides.CurrentContext)
-				}
-
-				overrides.Context = clientcmdapi.Context{}
-				if authInfoOk {
-					overrides.Context.AuthInfo = authInfo.(string)
-				}
-				if clusterOk {
-					overrides.Context.Cluster = cluster.(string)
-				}
-				log.Printf("[DEBUG] Using overidden context: %#v", overrides.Context)
+			if clusterOk {
+				overrides.Context.Cluster = cluster.(string)
 			}
+			log.Printf("[DEBUG] Using overidden context: %#v", overrides.Context)
 		}
 	}
 

website/docs/index.html.markdown

@@ -10,10 +10,6 @@ description: |-
 
 The Helm provider is used to deploy software packages in Kubernetes. The provider needs to be configured with the proper credentials before it can be used.
 
-## Data Sources
-
-* [Data Sources: helm_repository](d/repository.html)
-
 ## Resources
 
 * [Resource: helm_release](r/release.html)
@@ -94,7 +90,7 @@ The following arguments are supported:
 
 The `kubernetes` block supports:
 
-* `config_path` - (Optional) Path to the kube config file, defaults to `~/.kube/config`. Can be sourced from `KUBE_CONFIG` or `KUBECONFIG`..
+* `config_path` - (Optional) Path to the kube config file. Can be sourced from `KUBE_CONFIG_PATH`.
 * `host` - (Optional) The hostname (in form of URI) of Kubernetes master. Can be sourced from `KUBE_HOST`.
 * `username` - (Optional) The username to use for HTTP basic authentication when accessing the Kubernetes master endpoint. Can be sourced from `KUBE_USER`.
 * `password` - (Optional) The password to use for HTTP basic authentication when accessing the Kubernetes master endpoint. Can be sourced from `KUBE_PASSWORD`.
@@ -104,7 +100,6 @@ The `kubernetes` block supports:
 * `client_key` - (Optional) PEM-encoded client certificate key for TLS authentication. Can be sourced from `KUBE_CLIENT_KEY_DATA`.
 * `cluster_ca_certificate` - (Optional) PEM-encoded root certificates bundle for TLS authentication. Can be sourced from `KUBE_CLUSTER_CA_CERT_DATA`.
 * `config_context` - (Optional) Context to choose from the config file. Can be sourced from `KUBE_CTX`.
-* `load_config_file` - (Optional) By default the local config (~/.kube/config) is loaded when you use this provider. This option at false disable this behaviour. Can be sourced from `KUBE_LOAD_CONFIG_FILE`.
 * `exec` - (Optional) Configuration block to use an [exec-based credential plugin](https://kubernetes.io/docs/reference/access-authn-authz/authentication/#client-go-credential-plugins), e.g. call an external command to receive user credentials.
   * `api_version` - (Required) API version to use when decoding the ExecCredentials resource, e.g. `client.authentication.k8s.io/v1beta1`.
   * `command` - (Required) Command to execute.