Fix lastAppliedTags annotations naming

Valid annotation keys have two segments: an optional prefix and name,
separated by a slash (/). In this commit, we fix the ones that include
two slashes that couldn't be parsed as valid structs.

Closes #3863

Signed-off-by: Jim Ntosas <[email protected]>

Author: dntosas

controllers/awsmachine_security_groups.go

@@ -31,7 +31,7 @@ const (
 	// the AdditionalSecurityGroups in the Machine Provider Config.
 	// See https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
 	// for annotation formatting rules.
-	SecurityGroupsLastAppliedAnnotation = "sigs.k8s.io/cluster-api-provider-aws/v2-last-applied-security-groups"
+	SecurityGroupsLastAppliedAnnotation = "sigs.k8s.io/cluster-api-provider-aws-last-applied-security-groups"
 )
 
 // Ensures that the security groups of the machine are correct

controllers/awsmachine_tags.go

@@ -26,7 +26,7 @@ const (
 	// which tracks the AdditionalTags in the Machine Provider Config.
 	// See https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
 	// for annotation formatting rules.
-	TagsLastAppliedAnnotation = "sigs.k8s.io/cluster-api-provider-aws/v2-last-applied-tags"
+	TagsLastAppliedAnnotation = "sigs.k8s.io/cluster-api-provider-aws-last-applied-tags"
 
 	// VolumeTagsLastAppliedAnnotation is the key for the ebs volumes annotation
 	// which tracks the AdditionalTags in the Machine Provider Config.

pkg/cloud/services/ec2/launchtemplate.go

@@ -47,7 +47,7 @@ const (
 	// AdditionalTags in the AWSMachinePool Provider Config.
 	// See https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
 	// for annotation formatting rules.
-	TagsLastAppliedAnnotation = "sigs.k8s.io/cluster-api-provider-aws/v2-last-applied-tags"
+	TagsLastAppliedAnnotation = "sigs.k8s.io/cluster-api-provider-aws-last-applied-tags"
 )
 
 func (s *Service) ReconcileLaunchTemplate(