Skip to content

✨ eks: skip aws:-prefixed tags in nodegroup reconciliation #5965

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

Open
cPu1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

✨ eks: skip aws:-prefixed tags in nodegroup reconciliation #5965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 14 additions & 28 deletions pkg/cloud/services/eks/tags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ package eks
import (
"context"
"fmt"
"slices"
"strings"

"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/autoscaling"
Expand Down Expand Up @@ -63,23 +65,23 @@ func (s *Service) getEKSTagParams(id string) *infrav1.BuildParams {
}
}

func getTagUpdates(currentTags map[string]string, tags map[string]string) (untagKeys []string, newTags map[string]string) {
func getTagUpdates(currentTags map[string]string, desiredTags map[string]string) (untagKeys []string, newTags map[string]string) {
untagKeys = []string{}
newTags = make(map[string]string)
for key := range currentTags {
if _, ok := tags[key]; !ok {
if _, ok := desiredTags[key]; !ok && !strings.HasPrefix(key, tags.AwsInternalTagPrefix) {
untagKeys = append(untagKeys, key)
}
}
for key, value := range tags {
for key, value := range desiredTags {
if currentV, ok := currentTags[key]; !ok || value != currentV {
newTags[key] = value
}
}
return untagKeys, newTags
}

func getASGTagUpdates(clusterName string, currentTags map[string]string, tags map[string]string) (tagsToDelete map[string]string, tagsToAdd map[string]string) {
func getASGTagUpdates(clusterName string, currentTags, desiredTags map[string]string) (tagsToDelete, tagsToAdd map[string]string) {
officialASGTagsByEKS := []string{
eksClusterNameTag,
eksNodeGroupNameTag,
Expand All @@ -90,20 +92,11 @@ func getASGTagUpdates(clusterName string, currentTags map[string]string, tags ma
tagsToDelete = make(map[string]string)
tagsToAdd = make(map[string]string)
for k, v := range currentTags {
if _, ok := tags[k]; !ok {
isOfficialTag := false
for _, tag := range officialASGTagsByEKS {
if tag == k {
isOfficialTag = true
break
}
}
if !isOfficialTag {
tagsToDelete[k] = v
}
if _, ok := desiredTags[k]; !ok && !slices.Contains(officialASGTagsByEKS, k) {
tagsToDelete[k] = v
}
}
for key, value := range tags {
for key, value := range desiredTags {
if currentV, ok := currentTags[key]; !ok || value != currentV {
tagsToAdd[key] = value
}
Expand Down Expand Up @@ -137,16 +130,12 @@ func (s *NodegroupService) reconcileASGTags(ctx context.Context, ng *ekstypes.No
if len(tagsToAdd) > 0 {
input := &autoscaling.CreateOrUpdateTagsInput{}
for k, v := range tagsToAdd {
// The k/vCopy is used to address the "Implicit memory aliasing in for loop" issue
// https://stackoverflow.com/questions/62446118/implicit-memory-aliasing-in-for-loop
kCopy := k
vCopy := v
input.Tags = append(input.Tags, autoscalingtypes.Tag{
Key: &kCopy,
Key: ptr.To(k),
PropagateAtLaunch: aws.Bool(true),
ResourceId: asg.AutoScalingGroupName,
ResourceType: ptr.To[string]("auto-scaling-group"),
Value: &vCopy,
ResourceType: ptr.To("auto-scaling-group"),
Value: ptr.To(v),
})
}
_, err = s.AutoscalingClient.CreateOrUpdateTags(ctx, input)
Expand All @@ -158,13 +147,10 @@ func (s *NodegroupService) reconcileASGTags(ctx context.Context, ng *ekstypes.No
if len(tagsToDelete) > 0 {
input := &autoscaling.DeleteTagsInput{}
for k := range tagsToDelete {
// The k/vCopy is used to address the "Implicit memory aliasing in for loop" issue
// https://stackoverflow.com/questions/62446118/implicit-memory-aliasing-in-for-loop
kCopy := k
input.Tags = append(input.Tags, autoscalingtypes.Tag{
Key: &kCopy,
Key: ptr.To(k),
ResourceId: asg.AutoScalingGroupName,
ResourceType: ptr.To[string]("auto-scaling-group"),
ResourceType: ptr.To("auto-scaling-group"),
})
}
_, err = s.AutoscalingClient.DeleteTags(ctx, input)
Expand Down
12 changes: 12 additions & 0 deletions pkg/cloud/services/eks/tags_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,18 @@ func TestGetTagUpdates(t *testing.T) {
"x": "2",
},
},
{
current: map[string]string{
"kubernetes.io/cluster/foo": "owned",
"aws:cloudformation:stack-name": "eks-stack",
"nodegroup-name": "ng1",
},
next: map[string]string{
"kubernetes.io/cluster/foo": "owned",
},
expectUntag: []string{"nodegroup-name"},
expectTag: map[string]string{},
},
}
for i, tc := range testCases {
t.Run(strconv.Itoa(i), func(t *testing.T) {
Expand Down