From 0bcad0e8210f8ae3dc4d590b93c68eeb08450a79 Mon Sep 17 00:00:00 2001 From: Aleksandra Malinowska Date: Mon, 20 Aug 2018 11:18:41 +0200 Subject: [PATCH] Remove discoveryOptions from GKE manager constructor --- .../cloudprovider/builder/cloud_provider_builder.go | 8 ++++---- cluster-autoscaler/cloudprovider/gke/gke_manager.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cluster-autoscaler/cloudprovider/builder/cloud_provider_builder.go b/cluster-autoscaler/cloudprovider/builder/cloud_provider_builder.go index 3f2fab99a32a..0cbd5ccde5c7 100644 --- 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 index 3df6e8b8d3a1..e855d11d8d52 100644 --- 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("")