@@ -28,13 +28,14 @@ const (
2828 // Default Configuration for Pod ENI resource type
2929 PodENIDefaultWorker = 30
3030
31- // Default Configuration for IPv4 resource type
32- IPv4DefaultWorker = 2
33- IPv4DefaultWPSize = 3
34- IPv4DefaultMaxDev = 1
35- IPv4DefaultResSize = 0
36-
37- // Default Configuration for IPv4 prefix resource type
31+ // Default Windows Configuration for IPv4 resource type
32+ IPv4DefaultWinWorkerCount = 2
33+ IPv4DefaultWinWarmIPTarget = 1
34+ IPv4DefaultWinMinIPTarget = 3
35+ IPv4DefaultWinMaxDev = 0
36+ IPv4DefaultWinResSize = 0
37+
38+ // Default Windows Configuration for IPv4 prefix resource type
3839 IPv4PDDefaultWorker = 2
3940 IPv4PDDefaultWPSize = 1
4041 IPv4PDDefaultMaxDev = 0
@@ -70,26 +71,43 @@ func LoadResourceConfig() map[string]ResourceConfig {
7071func LoadResourceConfigFromConfigMap (log logr.Logger , vpcCniConfigMap * v1.ConfigMap ) map [string ]ResourceConfig {
7172 resourceConfig := getDefaultResourceConfig ()
7273
73- warmIPTarget , minIPTarget , warmPrefixTarget := ParseWinPDTargets (log , vpcCniConfigMap )
74+ warmIPTarget , minIPTarget , warmPrefixTarget , isPDEnabled := ParseWinIPTargetConfigs (log , vpcCniConfigMap )
7475
7576 // If no PD configuration is set in configMap or none is valid, return default resource config
7677 if warmIPTarget == 0 && minIPTarget == 0 && warmPrefixTarget == 0 {
7778 return resourceConfig
7879 }
7980
80- resourceConfig [ResourceNameIPAddressFromPrefix ].WarmPoolConfig .WarmIPTarget = warmIPTarget
81- resourceConfig [ResourceNameIPAddressFromPrefix ].WarmPoolConfig .MinIPTarget = minIPTarget
82- resourceConfig [ResourceNameIPAddressFromPrefix ].WarmPoolConfig .WarmPrefixTarget = warmPrefixTarget
81+ if isPDEnabled {
82+ resourceConfig [ResourceNameIPAddressFromPrefix ].WarmPoolConfig .WarmIPTarget = warmIPTarget
83+ resourceConfig [ResourceNameIPAddressFromPrefix ].WarmPoolConfig .MinIPTarget = minIPTarget
84+ resourceConfig [ResourceNameIPAddressFromPrefix ].WarmPoolConfig .WarmPrefixTarget = warmPrefixTarget
85+ } else {
86+ resourceConfig [ResourceNameIPAddress ].WarmPoolConfig .WarmIPTarget = warmIPTarget
87+ resourceConfig [ResourceNameIPAddress ].WarmPoolConfig .MinIPTarget = minIPTarget
88+ resourceConfig [ResourceNameIPAddress ].WarmPoolConfig .WarmPrefixTarget = warmPrefixTarget // ignore warm prefix in secondary IP mode
89+ }
8390
8491 return resourceConfig
8592}
8693
87- // ParseWinPDTargets parses config map for Windows prefix delegation configurations set by users
88- func ParseWinPDTargets (log logr.Logger , vpcCniConfigMap * v1.ConfigMap ) (warmIPTarget int , minIPTarget int , warmPrefixTarget int ) {
94+ // ParseWinIPTargetConfigs parses Windows IP target configuration parameters in the amazon-vpc-cni ConfigMap
95+ func ParseWinIPTargetConfigs (log logr.Logger , vpcCniConfigMap * v1.ConfigMap ) (warmIPTarget int , minIPTarget int , warmPrefixTarget int , isPDEnabled bool ) {
8996 warmIPTarget , minIPTarget , warmPrefixTarget = 0 , 0 , 0
9097
9198 if vpcCniConfigMap .Data == nil {
92- return warmIPTarget , minIPTarget , warmPrefixTarget
99+ log .V (1 ).Info ("No configuration found in ConfigMap, falling back to using secondary IP mode with default values" )
100+ isPDEnabled = false
101+ minIPTarget = IPv4DefaultWinMinIPTarget
102+ warmIPTarget = IPv4DefaultWinWarmIPTarget
103+ warmPrefixTarget = 0
104+ return warmIPTarget , minIPTarget , warmPrefixTarget , isPDEnabled
105+ }
106+
107+ isPDEnabled , err := strconv .ParseBool (vpcCniConfigMap .Data [EnableWindowsPrefixDelegationKey ])
108+ if err != nil {
109+ log .V (1 ).Info ("Failed to parse prefix delegation flag from ConfigMap, falling back to using secondary IP mode" )
110+ isPDEnabled = false
93111 }
94112
95113 warmIPTargetStr , foundWarmIP := vpcCniConfigMap .Data [WarmIPTarget ]
@@ -105,36 +123,59 @@ func ParseWinPDTargets(log logr.Logger, vpcCniConfigMap *v1.ConfigMap) (warmIPTa
105123 warmPrefixTargetStr , foundWarmPrefix = vpcCniConfigMap .Data [WinWarmPrefixTarget ]
106124 }
107125
108- // If no configuration is found, return 0
109- if ! foundWarmIP && ! foundMinIP && ! foundWarmPrefix {
110- return warmIPTarget , minIPTarget , warmPrefixTarget
111- }
112-
126+ // Handle the scenario where warm IP target is not configured
113127 if foundWarmIP {
114128 warmIPTargetInt , err := strconv .Atoi (warmIPTargetStr )
115129 if err != nil {
116- log .Error (err , "failed to parse warm ip target" , "warm ip target" , warmIPTargetStr )
130+ log .Error (err , "failed to parse warm ip target, defaulting to zero" , "warm ip target" , warmIPTargetStr )
131+ warmIPTarget = 0
117132 } else {
118133 warmIPTarget = warmIPTargetInt
119134 }
135+ } else {
136+ log .V (1 ).Info ("warm IP configuration not found in ConfigMap, will use default value" )
137+ if isPDEnabled {
138+ warmIPTarget = IPv4PDDefaultWarmIPTargetSize
139+ } else {
140+ warmIPTarget = IPv4DefaultWinWarmIPTarget
141+ }
120142 }
143+
144+ // Handle the scenario where minimum IP target is not configured
121145 if foundMinIP {
122146 minIPTargetInt , err := strconv .Atoi (minIPTargetStr )
123147 if err != nil {
124- log .Error (err , "failed to parse minimum ip target" , "minimum ip target" , minIPTargetStr )
148+ log .Error (err , "failed to parse minimum ip target, defaulting to zero" , "minimum ip target" , minIPTargetStr )
149+ minIPTarget = 0
125150 } else {
126151 minIPTarget = minIPTargetInt
127152 }
153+ } else {
154+ log .V (1 ).Info ("minimum IP configuration not found in ConfigMap, will use default value" )
155+ if isPDEnabled {
156+ minIPTarget = IPv4PDDefaultMinIPTargetSize
157+ } else {
158+ minIPTarget = IPv4DefaultWinMinIPTarget
159+ }
128160 }
129- if foundWarmPrefix {
161+
162+ // Handle the scenario where warm prefix target is not configured
163+ if ! isPDEnabled && foundWarmPrefix {
164+ log .V (1 ).Info ("warm prefix configuration not supported in secondary IP mode, will ignore warm prefix configuration" )
165+ } else if isPDEnabled && foundWarmPrefix {
130166 warmPrefixTargetInt , err := strconv .Atoi (warmPrefixTargetStr )
131167 if err != nil {
132- log .Error (err , "failed to parse warm prefix target" , "warm prefix target" , warmPrefixTargetStr )
168+ log .Error (err , "failed to parse warm prefix target, defaulting to zero" , "warm prefix target" , warmPrefixTargetStr )
169+ warmPrefixTarget = 0
133170 } else {
134171 warmPrefixTarget = warmPrefixTargetInt
135172 }
173+ } else if isPDEnabled && ! foundWarmPrefix {
174+ log .V (1 ).Info ("warm prefix configuration not found in ConfigMap, will use default value" )
175+ warmPrefixTarget = IPv4PDDefaultWarmPrefixTargetSize
136176 }
137- return warmIPTarget , minIPTarget , warmPrefixTarget
177+
178+ return warmIPTarget , minIPTarget , warmPrefixTarget , isPDEnabled
138179}
139180
140181// getDefaultResourceConfig returns the default Resource Configuration.
@@ -153,13 +194,15 @@ func getDefaultResourceConfig() map[string]ResourceConfig {
153194
154195 // Create default configuration for IPv4 Resource
155196 ipV4WarmPoolConfig := WarmPoolConfig {
156- DesiredSize : IPv4DefaultWPSize ,
157- MaxDeviation : IPv4DefaultMaxDev ,
158- ReservedSize : IPv4DefaultResSize ,
197+ DesiredSize : IPv4DefaultWinWarmIPTarget ,
198+ WarmIPTarget : IPv4DefaultWinWarmIPTarget ,
199+ MinIPTarget : IPv4DefaultWinMinIPTarget ,
200+ MaxDeviation : IPv4DefaultWinMaxDev ,
201+ ReservedSize : IPv4DefaultWinResSize ,
159202 }
160203 ipV4Config := ResourceConfig {
161204 Name : ResourceNameIPAddress ,
162- WorkerCount : IPv4DefaultWorker ,
205+ WorkerCount : IPv4DefaultWinWorkerCount ,
163206 SupportedOS : map [string ]bool {OSWindows : true , OSLinux : false },
164207 WarmPoolConfig : & ipV4WarmPoolConfig ,
165208 }
0 commit comments