diff --git a/cmd/cloud-controller-manager/main.go b/cmd/cloud-controller-manager/main.go index cf366935dad..4a311399192 100644 --- a/cmd/cloud-controller-manager/main.go +++ b/cmd/cloud-controller-manager/main.go @@ -41,15 +41,10 @@ import ( _ "k8s.io/component-base/metrics/prometheus/clientgo" // load all the prometheus client-go plugins _ "k8s.io/component-base/metrics/prometheus/version" // for version metric registration "k8s.io/klog/v2" - nodeipamcontrolleroptions "k8s.io/kubernetes/cmd/kube-controller-manager/app/options" - nodeipamconfig "k8s.io/kubernetes/pkg/controller/nodeipam/config" // For existing cloud providers, the option to import legacy providers is still available. // e.g. _"k8s.io/legacy-cloud-providers/" ) -var nodeIPAMControllerConfiguration nodeipamconfig.NodeIPAMControllerConfiguration -var nodeIPAMControllerOptions nodeipamcontrolleroptions.NodeIPAMControllerOptions - func main() { rand.Seed(time.Now().UnixNano()) diff --git a/cmd/cloud-controller-manager/nodeipamcontroller.go b/cmd/cloud-controller-manager/nodeipamcontroller.go index a39c40458cd..a99a47672c9 100644 --- a/cmd/cloud-controller-manager/nodeipamcontroller.go +++ b/cmd/cloud-controller-manager/nodeipamcontroller.go @@ -22,8 +22,7 @@ package main import ( "errors" "fmt" - "github.com/spf13/pflag" - + nodeipamcontrolleroptions "k8s.io/kubernetes/cmd/kube-controller-manager/app/options" "net" "net/http" "strings" @@ -35,7 +34,6 @@ import ( genericcontrollermanager "k8s.io/controller-manager/app" "k8s.io/controller-manager/pkg/features" "k8s.io/klog/v2" - nodeipamcontrolleroptions "k8s.io/kubernetes/cmd/kube-controller-manager/app/options" nodeipamcontroller "k8s.io/kubernetes/pkg/controller/nodeipam" nodeipamconfig "k8s.io/kubernetes/pkg/controller/nodeipam/config" "k8s.io/kubernetes/pkg/controller/nodeipam/ipam" @@ -49,19 +47,18 @@ const ( defaultNodeMaskCIDRIPv6 = 64 ) +var nodeIPAMControllerConfiguration nodeipamconfig.NodeIPAMControllerConfiguration +var nodeIPAMControllerOptions nodeipamcontrolleroptions.NodeIPAMControllerOptions + func startNodeIpamControllerWrapper(completedConfig *cloudcontrollerconfig.CompletedConfig, cloud cloudprovider.Interface) app.InitFunc { - fs := pflag.NewFlagSet("fs", pflag.ContinueOnError) - var nodeIPAMControllerOptions nodeipamcontrolleroptions.NodeIPAMControllerOptions - nodeIPAMControllerOptions.AddFlags(fs) errors := nodeIPAMControllerOptions.Validate() if len(errors) > 0 { klog.Fatal("NodeIPAM controller values are not properly set.") } - var nodeIPAMConfig nodeipamconfig.NodeIPAMControllerConfiguration - nodeIPAMControllerOptions.ApplyTo(&nodeIPAMConfig) + nodeIPAMControllerOptions.ApplyTo(&nodeIPAMControllerConfiguration) return func(ctx genericcontrollermanager.ControllerContext) (http.Handler, bool, error) { - return startNodeIpamController(completedConfig, nodeIPAMConfig, ctx, cloud) + return startNodeIpamController(completedConfig, nodeIPAMControllerConfiguration, ctx, cloud) } }