Skip to content

🐛 Fix constant re-applying of tags if AWSMachine.metadata.annotations is nil #5775

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −4
Open

🐛 Fix constant re-applying of tags if AWSMachine.metadata.annotations is nil #5775

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
10 changes: 6 additions & 4 deletions controllers/awsmachine_annotations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package controllers

import (
"encoding/json"
"maps"

infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
)
Expand All @@ -40,13 +41,14 @@ func (r *AWSMachineReconciler) updateMachineAnnotationJSON(machine *infrav1.AWSM
// `content`.
func (r *AWSMachineReconciler) updateMachineAnnotation(machine *infrav1.AWSMachine, annotation, content string) {
// Get the annotations
annotations := machine.GetAnnotations()
annotations := maps.Clone(machine.GetAnnotations())

// Set our annotation to the given content.
if annotations != nil {
annotations[annotation] = content
if annotations == nil {
annotations = map[string]string{}
}

annotations[annotation] = content

// Update the machine object with these annotations
machine.SetAnnotations(annotations)
}
Expand Down