Merge pull request #3867 from dntosas/fix/last-applied-annotations-naming

k8s-ci-robot · web-flow · commit c42112bb6cbd · 2022-11-22T08:42:14.000-08:00
Fix lastAppliedTags annotations naming
diff --git a/controllers/awsmachine_security_groups.go b/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
diff --git a/controllers/awsmachine_tags.go b/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.
diff --git a/pkg/cloud/services/ec2/launchtemplate.go b/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(

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ const (`
`31`	`31`	`// the AdditionalSecurityGroups in the Machine Provider Config.`
`32`	`32`	`// See https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/`
`33`	`33`	`// for annotation formatting rules.`
`34`		`- SecurityGroupsLastAppliedAnnotation = "sigs.k8s.io/cluster-api-provider-aws/v2-last-applied-security-groups"`
	`34`	`+ SecurityGroupsLastAppliedAnnotation = "sigs.k8s.io/cluster-api-provider-aws-last-applied-security-groups"`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`// Ensures that the security groups of the machine are correct`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ const (`
`47`	`47`	`// AdditionalTags in the AWSMachinePool Provider Config.`
`48`	`48`	`// See https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/`
`49`	`49`	`// for annotation formatting rules.`
`50`		`- TagsLastAppliedAnnotation = "sigs.k8s.io/cluster-api-provider-aws/v2-last-applied-tags"`
	`50`	`+ TagsLastAppliedAnnotation = "sigs.k8s.io/cluster-api-provider-aws-last-applied-tags"`
`51`	`51`	`)`
`52`	`52`
`53`	`53`	`func (s *Service) ReconcileLaunchTemplate(`