adding eni owner tag if cluster name is present #3228
Merged
+60
−43
Conversation
This file contains 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
haouc
reviewed
Mar 19, 2025
pkg/awsutils/awsutils_test.go
Outdated
| @@ -1316,6 +1316,7 @@ func TestEC2InstanceMetadataCache_buildENITags(t *testing.T) { | |||
| want: map[string]string{ | |||
| "node.k8s.amazonaws.com/instance_id": "i-xxxxx", | |||
| "cluster.k8s.amazonaws.com/name": "awesome-cluster", | |||
| "eks:eni:owner": "amazon-vpc-cni", | |||
There was a problem hiding this comment.
Can we use the variable defined in awsutils? We can then ensure we have tests on the same sources.
haouc
previously approved these changes
Mar 20, 2025
pkg/awsutils/awsutils_test.go
Outdated
| @@ -1882,6 +1887,7 @@ func TestEC2InstanceMetadataCache_TagENI(t *testing.T) { | |||
| currentTags: map[string]string{ | |||
| "node.k8s.amazonaws.com/instance_id": "i-xxxx", | |||
| "cluster.k8s.amazonaws.com/name": "awesome-cluster", | |||
| "eks:eni:owner": "amazon-vpc-cni", | |||
There was a problem hiding this comment.
nit: This lucky one got slipped away :) . This can be followed up. Thanks
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.
What type of PR is this?
Feature.
Now vpc-cni will add following tag when creating ENI which will help VPC-RC to help filter out ENI's created by vpc-cni and garbage clean them. Ref PR aws/amazon-vpc-resource-controller-k8s#505
Note:- With the current state of VPC-RC PR and VPC-CNI tag addition, there will be cleanup of eni's from both components. To resolve that customer has to disable cleanup of eni in VPC-CNI with env variable
DISABLE_LEAKED_ENI_CLEANUPWhich 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.