add dualstack feature to nodeipam controller

cmd/aws-cloud-controller-manager/main.go

@@ -34,7 +34,6 @@ import (
 	cloudprovider "k8s.io/cloud-provider"
 	"k8s.io/cloud-provider-aws/pkg/controllers/nodeipam"
 	"k8s.io/cloud-provider-aws/pkg/controllers/tagging"
-
 	awsv1 "k8s.io/cloud-provider-aws/pkg/providers/v1"
 	awsv2 "k8s.io/cloud-provider-aws/pkg/providers/v2"
 	"k8s.io/cloud-provider/app"
@@ -76,6 +75,12 @@ func main() {
 		Constructor: taggingControllerWrapper.StartTaggingControllerWrapper,
 	}
 
+	controllerInitializers[tagging.TaggingControllerKey] = taggingControllerConstructor
+	app.ControllersDisabledByDefault.Insert(tagging.TaggingControllerKey)
+
+	controllerAliases := names.CCMControllerAliases()
+	controllerAliases[tagging.TaggingControllerKey] = tagging.TaggingControllerKey
+
 	nodeIpamControllerWrapper := nodeipam.ControllerWrapper{}
 	nodeIpamControllerWrapper.Options.AddFlags(fss.FlagSet("nodeipam controller"))
 
@@ -86,20 +91,14 @@ func main() {
 		Constructor: nodeIpamControllerWrapper.StartNodeIpamControllerWrapper,
 	}
 
-	controllerInitializers[tagging.TaggingControllerKey] = taggingControllerConstructor
-	app.ControllersDisabledByDefault.Insert(tagging.TaggingControllerKey)
-
-	controllerAliases := names.CCMControllerAliases()
-	controllerAliases[tagging.TaggingControllerKey] = tagging.TaggingControllerKey
-
 	controllerInitializers[nodeipam.NodeIpamControllerKey] = nodeIpamControllerConstructor
 	app.ControllersDisabledByDefault.Insert(nodeipam.NodeIpamControllerKey)
+
 	command := app.NewCloudControllerManagerCommand(opts, cloudInitializer, controllerInitializers, controllerAliases, fss, wait.NeverStop)
 
 	if err := command.Execute(); err != nil {
 		klog.Fatalf("unable to execute command: %v", err)
 	}
-
 }
 
 func cloudInitializer(config *cloudcontrollerconfig.CompletedConfig) cloudprovider.Interface {

pkg/controllers/nodeipam/config/types.go

@@ -0,0 +1,30 @@
+/*
+Copyright 2023 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package config
+
+import "net"
+
+// NodeIPAMControllerConfiguration contains elements describing NodeIPAMController.
+type NodeIPAMControllerConfiguration struct {
+	RateLimit    float64
+	BurstLimit   int
+	DualStack    bool
+	ClusterCIDRs []*net.IPNet
+	// NodeCIDRMaskSize is the mask size for node cidr in single-stack cluster.
+	// This can be used only with single stack clusters and is incompatible with dual stack clusters.
+	NodeCIDRMaskSize int32
+}