Merge pull request #1160 from aleksandra-malinowska/refactor-cp-24

Remove discoveryOptions from GKE manager constructor
kubernetes · Aug 20, 2018 · e438e6b · e438e6b
2 parents c008081 + 0bcad0e
commit e438e6b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cluster-autoscaler/cloudprovider/builder/cloud_provider_builder.go b/cluster-autoscaler/cloudprovider/builder/cloud_provider_builder.go
@@ -67,9 +67,9 @@ func NewCloudProvider(opts config.AutoscalingOptions) cloudprovider.CloudProvide
 			glog.Fatalf("GKE gets nodegroup specification via API, command line specs are not allowed")
 		}
 		if opts.NodeAutoprovisioningEnabled {
-			return buildGKE(opts, do, rl, gke.ModeGKENAP)
+			return buildGKE(opts, rl, gke.ModeGKENAP)
 		}
-		return buildGKE(opts, do, rl, gke.ModeGKE)
+		return buildGKE(opts, rl, gke.ModeGKE)
 	case aws.ProviderName:
 		return buildAWS(opts, do, rl)
 	case azure.ProviderName:
@@ -110,7 +110,7 @@ func buildGCE(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscover
 	return provider
 }
 
-func buildGKE(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscoveryOptions, rl *cloudprovider.ResourceLimiter, mode gke.GcpCloudProviderMode) cloudprovider.CloudProvider {
+func buildGKE(opts config.AutoscalingOptions, rl *cloudprovider.ResourceLimiter, mode gke.GcpCloudProviderMode) cloudprovider.CloudProvider {
 	var config io.ReadCloser
 	if opts.CloudConfig != "" {
 		var err error
@@ -121,7 +121,7 @@ func buildGKE(opts config.AutoscalingOptions, do cloudprovider.NodeGroupDiscover
 		defer config.Close()
 	}
 
-	manager, err := gke.CreateGkeManager(config, mode, opts.ClusterName, do, opts.Regional)
+	manager, err := gke.CreateGkeManager(config, mode, opts.ClusterName, opts.Regional)
 	if err != nil {
 		glog.Fatalf("Failed to create GKE Manager: %v", err)
 	}

diff --git a/cluster-autoscaler/cloudprovider/gke/gke_manager.go b/cluster-autoscaler/cloudprovider/gke/gke_manager.go
@@ -127,7 +127,7 @@ type gkeManagerImpl struct {
 }
 
 // CreateGkeManager constructs gkeManager object.
-func CreateGkeManager(configReader io.Reader, mode GcpCloudProviderMode, clusterName string, discoveryOpts cloudprovider.NodeGroupDiscoveryOptions, regional bool) (GkeManager, error) {
+func CreateGkeManager(configReader io.Reader, mode GcpCloudProviderMode, clusterName string, regional bool) (GkeManager, error) {
 	// Create Google Compute Engine token.
 	var err error
 	tokenSource := google.ComputeTokenSource("")