Drop usage of rest.InClusterConfig()

This is automatically done in BuildConfigFromFlags().
kubernetes · Apr 29, 2019 · bb53e90 · bb53e90
1 parent d6587d6
commit bb53e90
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_provider.go b/cluster-autoscaler/cloudprovider/clusterapi/clusterapi_provider.go
@@ -134,26 +134,21 @@ func newProvider(
 // BuildClusterAPI builds CloudProvider implementation for machine api.
 func BuildClusterAPI(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter) cloudprovider.CloudProvider {
 	var err error
-	var externalConfig *rest.Config
-
-	externalConfig, err = rest.InClusterConfig()
-	if err != nil && err != rest.ErrNotInCluster {
-		klog.Fatal(err)
-	}
+	var config *rest.Config
 
 	if opts.KubeConfigPath != "" {
-		externalConfig, err = clientcmd.BuildConfigFromFlags("", opts.KubeConfigPath)
+		config, err = clientcmd.BuildConfigFromFlags("", opts.KubeConfigPath)
 		if err != nil {
 			klog.Fatalf("cannot build config: %v", err)
 		}
 	}
 
-	kubeclient, err := kubernetes.NewForConfig(externalConfig)
+	kubeclient, err := kubernetes.NewForConfig(config)
 	if err != nil {
 		klog.Fatalf("create kube clientset failed: %v", err)
 	}
 
-	clusterclient, err := clusterclientset.NewForConfig(externalConfig)
+	clusterclient, err := clusterclientset.NewForConfig(config)
 	if err != nil {
 		klog.Fatalf("create cluster clientset failed: %v", err)
 	}