Merge "Remove the env var KUBECONFIG"