diff --git a/cmd/cloud-controller-manager/main.go b/cmd/cloud-controller-manager/main.go index 62843f55a2b..27860fe1fd8 100644 --- a/cmd/cloud-controller-manager/main.go +++ b/cmd/cloud-controller-manager/main.go @@ -33,7 +33,8 @@ import ( "time" "github.com/spf13/pflag" - cloudprovider "k8s.io/cloud-provider" + + "k8s.io/cloud-provider" "k8s.io/cloud-provider/app" cloudcontrollerconfig "k8s.io/cloud-provider/app/config" "k8s.io/cloud-provider/options" @@ -56,9 +57,6 @@ const ( func main() { rand.Seed(time.Now().UnixNano()) - // cloudProviderConfigFile shows an sample of parse config file from flag option - var flagset *pflag.FlagSet = pflag.NewFlagSet("flagSet", pflag.ContinueOnError) - var cloudProviderConfigFile *string = flagset.String("cloud-provider-configfile", "", "This is the sample input for cloud provider config file") pflag.CommandLine.ParseErrorsWhitelist.UnknownFlags = true _ = pflag.CommandLine.Parse(os.Args[1:]) @@ -75,7 +73,7 @@ func main() { os.Exit(1) } - cloud, err := cloudprovider.InitCloudProvider(cloudProviderName, *cloudProviderConfigFile) + cloud, err := cloudprovider.InitCloudProvider(cloudProviderName, c.ComponentConfig.KubeCloudShared.CloudProvider.CloudConfigFile) if err != nil { klog.Fatalf("Cloud provider could not be initialized: %v", err) } diff --git a/staging/src/k8s.io/cloud-provider/sample/advanced_main.go b/staging/src/k8s.io/cloud-provider/sample/advanced_main.go index 49b7198509c..b541ba531f3 100644 --- a/staging/src/k8s.io/cloud-provider/sample/advanced_main.go +++ b/staging/src/k8s.io/cloud-provider/sample/advanced_main.go @@ -28,6 +28,7 @@ import ( "time" "github.com/spf13/pflag" + "k8s.io/cloud-provider" "k8s.io/cloud-provider/app" "k8s.io/cloud-provider/options" @@ -50,9 +51,6 @@ const ( func advancedMain() { rand.Seed(time.Now().UnixNano()) - // cloudProviderConfigFile shows an sample of parse config file from flag option - var flagset *pflag.FlagSet = pflag.NewFlagSet("flagSet", pflag.ContinueOnError) - var cloudProviderConfigFile *string = flagset.String("cloud-provider-configfile", "", "This is the sample input for cloud provider config file") pflag.CommandLine.ParseErrorsWhitelist.UnknownFlags = true _ = pflag.CommandLine.Parse(os.Args[1:]) @@ -69,7 +67,7 @@ func advancedMain() { os.Exit(1) } - cloud, err := cloudprovider.InitCloudProvider(cloudProviderName, *cloudProviderConfigFile) + cloud, err := cloudprovider.InitCloudProvider(cloudProviderName, c.ComponentConfig.KubeCloudShared.CloudProvider.CloudConfigFile) if err != nil { klog.Fatalf("Cloud provider could not be initialized: %v", err) } diff --git a/staging/src/k8s.io/cloud-provider/sample/basic_main.go b/staging/src/k8s.io/cloud-provider/sample/basic_main.go index f00873f3ac7..73df23faeb6 100644 --- a/staging/src/k8s.io/cloud-provider/sample/basic_main.go +++ b/staging/src/k8s.io/cloud-provider/sample/basic_main.go @@ -28,6 +28,7 @@ import ( "time" "github.com/spf13/pflag" + "k8s.io/cloud-provider" "k8s.io/cloud-provider/app" "k8s.io/cloud-provider/options" @@ -45,8 +46,6 @@ const ( // sampleCloudProviderName shows an sample of using hard coded parameter for CloudProviderName sampleCloudProviderName = "SampleCloudProviderName" - // sampleCloudProviderConfigFile shows an sample of using hard coded parameter for CloudProviderConfigFile - sampleCloudProviderConfigFile = "sampleCloudProviderConfigFile" ) func main() { @@ -63,7 +62,7 @@ func main() { } // initialize cloud provider with the cloud provider name and config file provided - cloud, err := cloudprovider.InitCloudProvider(sampleCloudProviderName, sampleCloudProviderConfigFile) + cloud, err := cloudprovider.InitCloudProvider(sampleCloudProviderName, c.ComponentConfig.KubeCloudShared.CloudProvider.CloudConfigFile) if err != nil { klog.Fatalf("Cloud provider could not be initialized: %v", err) }