Skip to content

Commit e97bfe7

Browse files
haoucdshehbaj
andauthored
feat: enhanced subnet discovery rebase from #3380 (#3463)
* pkg awsutils * pkg ec2wrapper: add func to describe subnets * pkg ipamd: handle primary ENI exclusion * test: add integration test * pkg: enable subnet discovery for IPv6 mode * test integration eni-subnet-discovery: extend tests for IPv6 mode * pkg: use shared context for awsutils and ipamd * pkg awsutils: fix compilation error * pkg ipamd: clean up ENI if not previously used * pkg ipamd: gracefully exclude primary ENI if existing pods * test integration: add integration test for primary ENI exclusion * pkg ipamd: fix bug when calculating currentENIs when primary ENI is excluded * pkg ipamd: implement secondary ENI exclusion logic * pkg ipamd: add unit test for secondary ENI exclusion * test integration: add integ test for secondary ENI exclusion testing * test integration: add test for security group refresh * rebase to latest mainline chnages * remove value check for tags * reviewed * updated based on comments * add more unit tests * primary ENI can't be easily ignored --------- Co-authored-by: Shehbaj Dhillon <dshehbaj@amazon.com>
1 parent 56e4256 commit e97bfe7

26 files changed

Lines changed: 7760 additions & 667 deletions

cmd/aws-k8s-agent/main.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,8 @@ func _main() int {
144144
}
145145
// Measure node initialization duration
146146
IPAMDNodeInitStartTime := time.Now()
147-
ipamContext, err := ipamd.New(k8sClient, withApiServer)
147+
ctx := context.Background()
148+
ipamContext, err := ipamd.New(ctx, k8sClient, withApiServer)
148149
IPAMDNodeInitDuration := time.Since(IPAMDNodeInitStartTime).Seconds()
149150

150151
if err != nil {
@@ -164,7 +165,7 @@ func _main() int {
164165
}
165166

166167
// Pool manager
167-
go ipamContext.StartNodeIPPoolManager()
168+
go ipamContext.StartNodeIPPoolManager(ctx)
168169

169170
if !utils.GetBoolAsStringEnvVar(envDisableMetrics, false) {
170171
// Prometheus metrics

cmd/routed-eni-cni-plugin/driver/mocks/driver_mocks.go

Lines changed: 33 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)