[ipam] add generic ipam-release-excess-ips flag and wire Azure

Signed-off-by: Jared Ledvina <jared.ledvina@datadoghq.com>

Author: jaredledvina

operator/pkg/ipam/allocator/azure/azure.go

@@ -22,6 +22,8 @@ type AllocatorAzure struct {
 	AzureResourceGroup          string
 	AzureUserAssignedIdentityID string
 	AzureUsePrimaryAddress      bool
+	AzureReleaseExcessIPs       bool
+	ExcessIPReleaseDelay        int
 	ParallelAllocWorkers        int64
 	LimitIPAMAPIBurst           int
 	LimitIPAMAPIQPS             float64
@@ -75,7 +77,7 @@ func (a *AllocatorAzure) Start(ctx context.Context, getterUpdater allocator.Cili
 		return nil, fmt.Errorf("unable to create Azure client: %w", err)
 	}
 	instances := ipam.NewInstancesManager(a.rootLogger, azureClient, a.AzureUsePrimaryAddress)
-	nodeManager, err := nodemanager.NewNodeManager(a.logger, instances, getterUpdater, iMetrics, a.ParallelAllocWorkers, false, 0, false)
+	nodeManager, err := nodemanager.NewNodeManager(a.logger, instances, getterUpdater, iMetrics, a.ParallelAllocWorkers, a.AzureReleaseExcessIPs, a.ExcessIPReleaseDelay, false)
 	if err != nil {
 		return nil, fmt.Errorf("unable to initialize Azure node manager: %w", err)
 	}

operator/pkg/ipam/aws.go

@@ -35,7 +35,6 @@ func init() {
 
 type AWSConfig struct {
 	AWSReleaseExcessIPs          bool
-	ExcessIPReleaseDelay         int
 	AWSEnablePrefixDelegation    bool
 	ENITags                      map[string]string
 	ENIGarbageCollectionTags     map[string]string `mapstructure:"eni-gc-tags"`
@@ -49,7 +48,6 @@ type AWSConfig struct {
 
 var awsDefaultConfig = AWSConfig{
 	AWSReleaseExcessIPs:          false,
-	ExcessIPReleaseDelay:         180,
 	AWSEnablePrefixDelegation:    false,
 	ENITags:                      nil,
 	ENIGarbageCollectionTags:     nil,
@@ -63,7 +61,7 @@ var awsDefaultConfig = AWSConfig{
 
 func (cfg AWSConfig) Flags(flags *pflag.FlagSet) {
 	flags.Bool("aws-release-excess-ips", awsDefaultConfig.AWSReleaseExcessIPs, "Enable releasing excess free IP addresses from AWS ENI.")
-	flags.Int("excess-ip-release-delay", awsDefaultConfig.ExcessIPReleaseDelay, "Number of seconds operator would wait before it releases an IP previously marked as excess")
+	flags.MarkDeprecated("aws-release-excess-ips", "use --ipam-release-excess-ips instead")
 	flags.Bool("aws-enable-prefix-delegation", awsDefaultConfig.AWSEnablePrefixDelegation, "Allows operator to allocate prefixes to ENIs instead of individual IP addresses")
 	flags.StringToString("eni-tags", awsDefaultConfig.ENITags,
 		"ENI tags in the form of k1=v1 (multiple k/v pairs can be passed by repeating the CLI flag)")
@@ -97,8 +95,8 @@ type awsParams struct {
 
 func startAWSAllocator(p awsParams) {
 	alloc := &aws.AllocatorAWS{
-		AWSReleaseExcessIPs:          p.AwsCfg.AWSReleaseExcessIPs,
-		ExcessIPReleaseDelay:         p.AwsCfg.ExcessIPReleaseDelay,
+		AWSReleaseExcessIPs:          p.AwsCfg.AWSReleaseExcessIPs || p.Cfg.IPAMReleaseExcessIPs,
+		ExcessIPReleaseDelay:         p.Cfg.ExcessIPReleaseDelay,
 		AWSEnablePrefixDelegation:    p.AwsCfg.AWSEnablePrefixDelegation,
 		ENITags:                      p.AwsCfg.ENITags,
 		ENIGarbageCollectionTags:     p.AwsCfg.ENIGarbageCollectionTags,

operator/pkg/ipam/azure.go

@@ -76,6 +76,8 @@ func startAzureAllocator(p azureParams) {
 		AzureResourceGroup:          p.AzureCfg.AzureResourceGroup,
 		AzureUserAssignedIdentityID: p.AzureCfg.AzureUserAssignedIdentityID,
 		AzureUsePrimaryAddress:      p.AzureCfg.AzureUsePrimaryAddress,
+		AzureReleaseExcessIPs:       p.Cfg.IPAMReleaseExcessIPs,
+		ExcessIPReleaseDelay:        p.Cfg.ExcessIPReleaseDelay,
 		ParallelAllocWorkers:        p.Cfg.ParallelAllocWorkers,
 		LimitIPAMAPIBurst:           p.Cfg.LimitIPAMAPIBurst,
 		LimitIPAMAPIQPS:             p.Cfg.LimitIPAMAPIQPS,

operator/pkg/ipam/cell.go

@@ -31,16 +31,27 @@ type Config struct {
 	ParallelAllocWorkers int64
 	LimitIPAMAPIBurst    int
 	LimitIPAMAPIQPS      float64
+	// IPAMReleaseExcessIPs enables releasing excess free IP addresses,
+	// independent of cloud provider. It supersedes the per-provider
+	// --{aws,alibaba-cloud}-release-excess-ips flags.
+	IPAMReleaseExcessIPs bool
+	// ExcessIPReleaseDelay is the number of seconds the operator waits before
+	// it releases an IP previously marked as excess.
+	ExcessIPReleaseDelay int
 }
 
 var defaultConfig = Config{
 	ParallelAllocWorkers: 50,
 	LimitIPAMAPIBurst:    20,
 	LimitIPAMAPIQPS:      4.0,
+	IPAMReleaseExcessIPs: false,
+	ExcessIPReleaseDelay: 180,
 }
 
 func (cfg Config) Flags(flags *pflag.FlagSet) {
 	flags.Int64(option.ParallelAllocWorkers, defaultConfig.ParallelAllocWorkers, "Maximum number of parallel IPAM workers")
 	flags.Int("limit-ipam-api-burst", defaultConfig.LimitIPAMAPIBurst, "Upper burst limit when accessing external APIs")
 	flags.Float64("limit-ipam-api-qps", defaultConfig.LimitIPAMAPIQPS, "Queries per second limit when accessing external IPAM APIs")
+	flags.Bool("ipam-release-excess-ips", defaultConfig.IPAMReleaseExcessIPs, "Enable releasing excess free IP addresses from the cloud provider, regardless of the provider in use.")
+	flags.Int("excess-ip-release-delay", defaultConfig.ExcessIPReleaseDelay, "Number of seconds operator would wait before it releases an IP previously marked as excess")
 }