@@ -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 = 3
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,39 @@ 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" )
100+ return warmIPTarget , minIPTarget , warmPrefixTarget , isPDEnabled
101+ }
102+
103+ isPDEnabled , err := strconv .ParseBool (vpcCniConfigMap .Data [EnableWindowsPrefixDelegationKey ])
104+ if err != nil {
105+ log .V (1 ).Info ("Failed to parse prefix delegation flag from ConfigMap, falling back to using secondary IP mode" )
106+ isPDEnabled = false
93107 }
94108
95109 warmIPTargetStr , foundWarmIP := vpcCniConfigMap .Data [WarmIPTarget ]
@@ -105,36 +119,70 @@ func ParseWinPDTargets(log logr.Logger, vpcCniConfigMap *v1.ConfigMap) (warmIPTa
105119 warmPrefixTargetStr , foundWarmPrefix = vpcCniConfigMap .Data [WinWarmPrefixTarget ]
106120 }
107121
108- // If no configuration is found, return 0
109- if ! foundWarmIP && ! foundMinIP && ! foundWarmPrefix {
110- return warmIPTarget , minIPTarget , warmPrefixTarget
111- }
112-
122+ // If warm IP target config value is not found, or there is an error parsing it, the value will be set to zero
113123 if foundWarmIP {
114124 warmIPTargetInt , err := strconv .Atoi (warmIPTargetStr )
115125 if err != nil {
116- log .Error (err , "failed to parse warm ip target" , "warm ip target" , warmIPTargetStr )
126+ log .V (1 ).Info ("could not parse warm ip target, defaulting to zero" , "warm ip target" , warmIPTargetStr )
127+ warmIPTarget = 0
117128 } else {
118129 warmIPTarget = warmIPTargetInt
119130 }
131+ } else {
132+ log .V (1 ).Info ("could not find warm ip target in ConfigMap, defaulting to zero" )
133+ warmIPTarget = 0
120134 }
135+
136+ // If min IP target config value is not found, or there is an error parsing it, the value will be set to zero
121137 if foundMinIP {
122138 minIPTargetInt , err := strconv .Atoi (minIPTargetStr )
123139 if err != nil {
124- log .Error (err , "failed to parse minimum ip target" , "minimum ip target" , minIPTargetStr )
140+ log .V (1 ).Info ("could not parse minimum ip target, defaulting to zero" , "minimum ip target" , minIPTargetStr )
141+ minIPTarget = 0
125142 } else {
126143 minIPTarget = minIPTargetInt
127144 }
145+ } else {
146+ log .V (1 ).Info ("could not find minimum ip target in ConfigMap, defaulting to zero" )
147+ minIPTarget = 0
128148 }
129- if foundWarmPrefix {
149+
150+ // If PD is enabled and warm prefix target config value is not found, or there is an error parsing it, the value will be set to zero
151+ if ! isPDEnabled && foundWarmPrefix {
152+ log .V (1 ).Info ("warm prefix configuration not supported in secondary IP mode, will ignore warm prefix configuration" )
153+ warmPrefixTarget = 0
154+ } else if isPDEnabled && foundWarmPrefix {
130155 warmPrefixTargetInt , err := strconv .Atoi (warmPrefixTargetStr )
131156 if err != nil {
132- log .Error (err , "failed to parse warm prefix target" , "warm prefix target" , warmPrefixTargetStr )
157+ log .Error (err , "failed to parse warm prefix target, defaulting to zero" , "warm prefix target" , warmPrefixTargetStr )
158+ warmPrefixTarget = 0
133159 } else {
134160 warmPrefixTarget = warmPrefixTargetInt
135161 }
162+ } else if isPDEnabled && ! foundWarmPrefix {
163+ log .V (1 ).Info ("could not find warm prefix target in ConfigMap, defaulting to zero" )
164+ warmPrefixTarget = 0
165+ }
166+
167+ // If all three config parameter values (warm-ip-target, min-ip-target, warm-prefix-target) are 0,
168+ // Then default values for warm-ip-target and min-ip-target will be set
169+ // This ensures that when in PD mode and warm-prefix-target is set, then it can take precedence when other configs are unspecified
170+ if warmIPTarget == 0 && minIPTarget == 0 {
171+ if isPDEnabled && warmPrefixTarget == 0 {
172+ minIPTarget = IPv4PDDefaultMinIPTargetSize
173+ warmIPTarget = IPv4PDDefaultWarmIPTargetSize
174+ } else if ! isPDEnabled {
175+ minIPTarget = IPv4DefaultWinMinIPTarget
176+ warmIPTarget = IPv4DefaultWinWarmIPTarget
177+ }
178+ log .V (1 ).Info (
179+ "No valid configuration values for warm-ip-target, min-ip-target and warm-prefix-target found in ConfigMap, falling back to using default values" ,
180+ "minIPTarget" , minIPTarget ,
181+ "warmIPTarget" , warmIPTarget ,
182+ )
136183 }
137- return warmIPTarget , minIPTarget , warmPrefixTarget
184+
185+ return warmIPTarget , minIPTarget , warmPrefixTarget , isPDEnabled
138186}
139187
140188// getDefaultResourceConfig returns the default Resource Configuration.
@@ -153,13 +201,15 @@ func getDefaultResourceConfig() map[string]ResourceConfig {
153201
154202 // Create default configuration for IPv4 Resource
155203 ipV4WarmPoolConfig := WarmPoolConfig {
156- DesiredSize : IPv4DefaultWPSize ,
157- MaxDeviation : IPv4DefaultMaxDev ,
158- ReservedSize : IPv4DefaultResSize ,
204+ DesiredSize : IPv4DefaultWinWarmIPTarget ,
205+ WarmIPTarget : IPv4DefaultWinWarmIPTarget ,
206+ MinIPTarget : IPv4DefaultWinMinIPTarget ,
207+ MaxDeviation : IPv4DefaultWinMaxDev ,
208+ ReservedSize : IPv4DefaultWinResSize ,
159209 }
160210 ipV4Config := ResourceConfig {
161211 Name : ResourceNameIPAddress ,
162- WorkerCount : IPv4DefaultWorker ,
212+ WorkerCount : IPv4DefaultWinWorkerCount ,
163213 SupportedOS : map [string ]bool {OSWindows : true , OSLinux : false },
164214 WarmPoolConfig : & ipV4WarmPoolConfig ,
165215 }
0 commit comments