Enhanced Subnet Discovery #3319
Draft
+2,598
−88
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dshehbaj
force-pushed
the
shehbaj/enhanced-subnet-discovery
branch
10 times, most recently
from
5eccde1 to
9b00b7d
Compare
dshehbaj
changed the title
dshehbaj
force-pushed
the
shehbaj/enhanced-subnet-discovery
branch
19 times, most recently
from
47077a1 to
36fde46
Compare
dshehbaj
force-pushed
the
shehbaj/enhanced-subnet-discovery
branch
4 times, most recently
from
40fe808 to
d48bfb8
Compare
dshehbaj
commented
Jul 1, 2025
Comment on lines
+1019
to
+1179
| // When subnet discovery is disabled, check if primary subnet is excluded | ||
| excluded, checkErr := cache.isPrimarySubnetExcluded() | ||
| if checkErr != nil { | ||
| // If we can't determine exclusion status, log warning and proceed | ||
| log.Warnf("Failed to check if primary subnet is excluded: %v. Proceeding with ENI creation attempt.", checkErr) | ||
| } else if excluded { | ||
| // Primary subnet is explicitly excluded | ||
| err = errors.New("primary subnet is tagged with kubernetes.io/role/cni=0 and subnet discovery is disabled - no valid subnets available for ENI creation") | ||
| log.Error(err.Error()) | ||
| return "", err | ||
| } | ||
|
|
There was a problem hiding this comment.
Deals with misconfiguration scenario where customer tags subnet for exclusion but does not have subnet discovery enabled.
dshehbaj
commented
Jul 1, 2025
Comment on lines
+973
to
+1122
| // Even in fallback, check if primary subnet is excluded | ||
| excluded, checkErr := cache.isPrimarySubnetExcluded() | ||
| if checkErr != nil { | ||
| log.Warnf("Failed to check if primary subnet is excluded: %v. Proceeding with ENI creation attempt.", checkErr) | ||
| } else if excluded { | ||
| // Primary subnet is explicitly excluded | ||
| err = errors.New("primary subnet is tagged with kubernetes.io/role/cni=0 - no valid subnets available for ENI creation") | ||
| log.Error(err.Error()) | ||
| return "", err | ||
| } |
There was a problem hiding this comment.
Dealing with the case where describe subnet call fails, but customer has also opted to exclude the primary subnet.
dshehbaj
force-pushed
the
shehbaj/enhanced-subnet-discovery
branch
from
e3939b6 to
3b148b7
Compare
dshehbaj
commented
Jul 1, 2025
Comment on lines
+846
to
+850
| // Skip excluded ENIs when calculating available IPs for pod allocation | ||
| if eni.IsExcludedForPodIPs { | ||
| continue | ||
| } | ||
|
|
There was a problem hiding this comment.
We skip the excluded ENI (which would the Primary ENI in this case practically speaking) from IP stat calculation.
Doing it here would automatically take care of warm target calculation in other places such as isDatastorePoolTooLow, shouldRemoveExtraENIs.
dshehbaj
force-pushed
the
shehbaj/enhanced-subnet-discovery
branch
from
239365a to
62e7ac9
Compare
dshehbaj
force-pushed
the
shehbaj/enhanced-subnet-discovery
branch
from
f0faefa to
3c0f314
Compare
dshehbaj
force-pushed
the
shehbaj/enhanced-subnet-discovery
branch
4 times, most recently
from
ca35915 to
dc96a75
Compare
dshehbaj
force-pushed
the
shehbaj/enhanced-subnet-discovery
branch
from
dc67e7f to
21a4854
Compare
dshehbaj
commented
Jul 1, 2025
pkg/awsutils/awsutils.go
Outdated
Comment on lines
562
to
572
| if err != nil { | ||
| awsAPIErrInc("DiscoverCustomSecurityGroups", err) | ||
| log.Warnf("Failed to discover custom security groups: %v", err) | ||
| log.Info("Falling back to using primary security groups for ENIs in secondary subnets") | ||
|
|
||
| // Clear custom security groups cache to trigger fallback behavior | ||
| cache.customSecurityGroups.Set([]string{}) | ||
|
|
||
| // Apply primary security groups to ENIs in secondary subnets as fallback | ||
| return cache.applyFallbackSecurityGroups(store) | ||
| } |
There was a problem hiding this comment.
Fallback to primary security group and show logs to customer if we fail to describe any secondary security groups.
We do the same fallback for primary subnets.
dshehbaj
force-pushed
the
shehbaj/enhanced-subnet-discovery
branch
from
13fbe14 to
77d99e0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
add testing doc here
add integration test screenshot here
add edge cases here
What type of PR is this?
Which issue does this PR fix?:
What does this PR do / Why do we need it?:
Testing done on this change:
Will this PR introduce any new dependencies?:
Will this break upgrades or downgrades? Has updating a running cluster been tested?:
Does this change require updates to the CNI daemonset config files to work?:
Does this PR introduce any user-facing change?:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.