Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding eni owner tag if cluster name is present #3228

Merged
merged 5 commits into from
Mar 20, 2025
Merged

adding eni owner tag if cluster name is present #3228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce5e607
adding eni owner tag if cluster name is present
yash97 Mar 4, 2025
19f3dc3
updating unit tests
yash97 Mar 5, 2025
074db21
Merge branch 'master' into eni-tag-cleanup
yash97 Mar 20, 2025
63240b6
updating test
yash97 Mar 20, 2025
f9a6eec
updating key value tag with their constant variables
yash97 Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/awsutils/awsutils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ const (
eniNodeTagKey = "node.k8s.amazonaws.com/instance_id"
eniCreatedAtTagKey = "node.k8s.amazonaws.com/createdAt"
eniClusterTagKey = "cluster.k8s.amazonaws.com/name"
eniOwnerTagKey = "eks:eni:owner"
eniOwnerTagValue = "amazon-vpc-cni"
additionalEniTagsEnvVar = "ADDITIONAL_ENI_TAGS"
reservedTagKeyPrefix = "k8s.amazonaws.com"
subnetDiscoveryTagKey = "kubernetes.io/role/cni"
Expand Down Expand Up @@ -1060,6 +1062,7 @@ func (cache *EC2InstanceMetadataCache) buildENITags() map[string]string {
// tag the ENI with "cluster.k8s.amazonaws.com/name=<cluster_name>"
if cache.clusterName != "" {
tags[eniClusterTagKey] = cache.clusterName
tags[eniOwnerTagKey] = eniOwnerTagValue
}
for key, value := range cache.additionalENITags {
tags[key] = value
Expand Down
100 changes: 57 additions & 43 deletions pkg/awsutils/awsutils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,7 @@ func TestEC2InstanceMetadataCache_buildENITags(t *testing.T) {
instanceID: "i-xxxxx",
},
want: map[string]string{
"node.k8s.amazonaws.com/instance_id": "i-xxxxx",
eniNodeTagKey: "i-xxxxx",
},
},
{
Expand All @@ -1314,8 +1314,9 @@ func TestEC2InstanceMetadataCache_buildENITags(t *testing.T) {
clusterName: "awesome-cluster",
},
want: map[string]string{
"node.k8s.amazonaws.com/instance_id": "i-xxxxx",
"cluster.k8s.amazonaws.com/name": "awesome-cluster",
eniNodeTagKey: "i-xxxxx",
eniClusterTagKey: "awesome-cluster",
eniOwnerTagKey: eniOwnerTagValue,
},
},
{
Expand All @@ -1328,9 +1329,9 @@ func TestEC2InstanceMetadataCache_buildENITags(t *testing.T) {
},
},
want: map[string]string{
"node.k8s.amazonaws.com/instance_id": "i-xxxxx",
"tagKey-1": "tagVal-1",
"tagKey-2": "tagVal-2",
eniNodeTagKey: "i-xxxxx",
"tagKey-1": "tagVal-1",
"tagKey-2": "tagVal-2",
},
},
}
Expand Down Expand Up @@ -1375,7 +1376,7 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Filters: []ec2types.Filter{
{
Name: aws.String("tag-key"),
Values: []string{"node.k8s.amazonaws.com/instance_id"},
Values: []string{eniNodeTagKey},
},
{
Name: aws.String("status"),
Expand Down Expand Up @@ -1408,7 +1409,7 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Filters: []ec2types.Filter{
{
Name: aws.String("tag-key"),
Values: []string{"node.k8s.amazonaws.com/instance_id"},
Values: []string{eniNodeTagKey},
},
{
Name: aws.String("status"),
Expand All @@ -1430,11 +1431,11 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Status: "available",
TagSet: []ec2types.Tag{
{
Key: aws.String("node.k8s.amazonaws.com/instance_id"),
Key: aws.String(eniNodeTagKey),
Value: aws.String("i-xxxxx"),
},
{
Key: aws.String("node.k8s.amazonaws.com/createdAt"),
Key: aws.String(eniCreatedAtTagKey),
Value: aws.String(tenMinuteAgo.Format(time.RFC3339)),
},
},
Expand All @@ -1452,11 +1453,11 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Status: "available",
TagSet: []ec2types.Tag{
{
Key: aws.String("node.k8s.amazonaws.com/instance_id"),
Key: aws.String(eniNodeTagKey),
Value: aws.String("i-xxxxx"),
},
{
Key: aws.String("node.k8s.amazonaws.com/createdAt"),
Key: aws.String(eniCreatedAtTagKey),
Value: aws.String(tenMinuteAgo.Format(time.RFC3339)),
},
},
Expand All @@ -1473,7 +1474,7 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Filters: []ec2types.Filter{
{
Name: aws.String("tag-key"),
Values: []string{"node.k8s.amazonaws.com/instance_id"},
Values: []string{eniNodeTagKey},
},
{
Name: aws.String("status"),
Expand All @@ -1495,11 +1496,11 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Status: "available",
TagSet: []ec2types.Tag{
{
Key: aws.String("node.k8s.amazonaws.com/instance_id"),
Key: aws.String(eniNodeTagKey),
Value: aws.String("i-xxxxx"),
},
{
Key: aws.String("node.k8s.amazonaws.com/createdAt"),
Key: aws.String(eniCreatedAtTagKey),
Value: aws.String(tenMinuteAgo.Format(time.RFC3339)),
},
},
Expand All @@ -1522,7 +1523,7 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Filters: []ec2types.Filter{
{
Name: aws.String("tag-key"),
Values: []string{"node.k8s.amazonaws.com/instance_id"},
Values: []string{eniNodeTagKey},
},
{
Name: aws.String("status"),
Expand All @@ -1544,11 +1545,11 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Status: "available",
TagSet: []ec2types.Tag{
{
Key: aws.String("node.k8s.amazonaws.com/instance_id"),
Key: aws.String(eniNodeTagKey),
Value: aws.String("i-xxxxx"),
},
{
Key: aws.String("node.k8s.amazonaws.com/createdAt"),
Key: aws.String(eniCreatedAtTagKey),
Value: aws.String(now.Format(time.RFC3339)),
},
},
Expand All @@ -1571,7 +1572,7 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Filters: []ec2types.Filter{
{
Name: aws.String("tag-key"),
Values: []string{"node.k8s.amazonaws.com/instance_id"},
Values: []string{eniNodeTagKey},
},
{
Name: aws.String("status"),
Expand Down Expand Up @@ -1604,7 +1605,7 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Filters: []ec2types.Filter{
{
Name: aws.String("tag-key"),
Values: []string{"node.k8s.amazonaws.com/instance_id"},
Values: []string{eniNodeTagKey},
},
{
Name: aws.String("status"),
Expand All @@ -1630,15 +1631,15 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Status: "available",
TagSet: []ec2types.Tag{
{
Key: aws.String("node.k8s.amazonaws.com/instance_id"),
Key: aws.String(eniNodeTagKey),
Value: aws.String("i-xxxxx"),
},
{
Key: aws.String("node.k8s.amazonaws.com/createdAt"),
Key: aws.String(eniCreatedAtTagKey),
Value: aws.String(tenMinuteAgo.Format(time.RFC3339)),
},
{
Key: aws.String("cluster.k8s.amazonaws.com/name"),
Key: aws.String(eniClusterTagKey),
Value: aws.String("awesome-cluster"),
},
},
Expand All @@ -1656,15 +1657,15 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Status: "available",
TagSet: []ec2types.Tag{
{
Key: aws.String("node.k8s.amazonaws.com/instance_id"),
Key: aws.String(eniNodeTagKey),
Value: aws.String("i-xxxxx"),
},
{
Key: aws.String("node.k8s.amazonaws.com/createdAt"),
Key: aws.String(eniCreatedAtTagKey),
Value: aws.String(tenMinuteAgo.Format(time.RFC3339)),
},
{
Key: aws.String("cluster.k8s.amazonaws.com/name"),
Key: aws.String(eniClusterTagKey),
Value: aws.String("awesome-cluster"),
},
},
Expand All @@ -1681,7 +1682,7 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Filters: []ec2types.Filter{
{
Name: aws.String("tag-key"),
Values: []string{"node.k8s.amazonaws.com/instance_id"},
Values: []string{eniNodeTagKey},
},
{
Name: aws.String("status"),
Expand All @@ -1707,15 +1708,15 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Status: "available",
TagSet: []ec2types.Tag{
{
Key: aws.String("node.k8s.amazonaws.com/instance_id"),
Key: aws.String(eniNodeTagKey),
Value: aws.String("i-xxxxx"),
},
{
Key: aws.String("node.k8s.amazonaws.com/createdAt"),
Key: aws.String(eniCreatedAtTagKey),
Value: aws.String(tenMinuteAgo.Format(time.RFC3339)),
},
{
Key: aws.String("cluster.k8s.amazonaws.com/name"),
Key: aws.String(eniClusterTagKey),
Value: aws.String("awesome-cluster"),
},
},
Expand All @@ -1738,7 +1739,7 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Filters: []ec2types.Filter{
{
Name: aws.String("tag-key"),
Values: []string{"node.k8s.amazonaws.com/instance_id"},
Values: []string{eniNodeTagKey},
},
{
Name: aws.String("status"),
Expand All @@ -1764,15 +1765,15 @@ func TestEC2InstanceMetadataCache_getLeakedENIs(t *testing.T) {
Status: "available",
TagSet: []ec2types.Tag{
{
Key: aws.String("node.k8s.amazonaws.com/instance_id"),
Key: aws.String(eniNodeTagKey),
Value: aws.String("i-xxxxx"),
},
{
Key: aws.String("node.k8s.amazonaws.com/createdAt"),
Key: aws.String(eniCreatedAtTagKey),
Value: aws.String(now.Format(time.RFC3339)),
},
{
Key: aws.String("cluster.k8s.amazonaws.com/name"),
Key: aws.String(eniClusterTagKey),
Value: aws.String("awesome-cluster"),
},
},
Expand Down Expand Up @@ -1852,11 +1853,15 @@ func TestEC2InstanceMetadataCache_TagENI(t *testing.T) {
Resources: []string{"eni-xxxx"},
Tags: []ec2types.Tag{
{
Key: aws.String("cluster.k8s.amazonaws.com/name"),
Key: aws.String(eniClusterTagKey),
Value: aws.String("awesome-cluster"),
},
{
Key: aws.String("node.k8s.amazonaws.com/instance_id"),
Key: aws.String(eniOwnerTagKey),
Value: aws.String(eniOwnerTagValue),
},
{
Key: aws.String(eniNodeTagKey),
Value: aws.String("i-xxxx"),
},
},
Expand All @@ -1880,8 +1885,9 @@ func TestEC2InstanceMetadataCache_TagENI(t *testing.T) {
args: args{
eniID: "eni-xxxx",
currentTags: map[string]string{
"node.k8s.amazonaws.com/instance_id": "i-xxxx",
"cluster.k8s.amazonaws.com/name": "awesome-cluster",
eniNodeTagKey: "i-xxxx",
eniClusterTagKey: "awesome-cluster",
eniOwnerTagKey: eniOwnerTagValue,
},
},
wantErr: nil,
Expand All @@ -1897,9 +1903,13 @@ func TestEC2InstanceMetadataCache_TagENI(t *testing.T) {
Resources: []string{"eni-xxxx"},
Tags: []ec2types.Tag{
{
Key: aws.String("cluster.k8s.amazonaws.com/name"),
Key: aws.String(eniClusterTagKey),
Value: aws.String("awesome-cluster"),
},
{
Key: aws.String(eniOwnerTagKey),
Value: aws.String(eniOwnerTagValue),
},
},
},
},
Expand All @@ -1908,8 +1918,8 @@ func TestEC2InstanceMetadataCache_TagENI(t *testing.T) {
args: args{
eniID: "eni-xxxx",
currentTags: map[string]string{
"node.k8s.amazonaws.com/instance_id": "i-xxxx",
"anotherKey": "anotherDay",
eniNodeTagKey: "i-xxxx",
"anotherKey": "anotherDay",
},
},
wantErr: nil,
Expand All @@ -1925,11 +1935,15 @@ func TestEC2InstanceMetadataCache_TagENI(t *testing.T) {
Resources: []string{"eni-xxxx"},
Tags: []ec2types.Tag{
{
Key: aws.String("cluster.k8s.amazonaws.com/name"),
Key: aws.String(eniClusterTagKey),
Value: aws.String("awesome-cluster"),
},
{
Key: aws.String("node.k8s.amazonaws.com/instance_id"),
Key: aws.String(eniOwnerTagKey),
Value: aws.String(eniOwnerTagValue),
},
{
Key: aws.String(eniNodeTagKey),
Value: aws.String("i-xxxx"),
},
},
Expand Down
Loading