Repository: kubernetes-sigs/cluster-api-provider-aws
Pull request #3891 (2022-11-30 12:45:43)

[release-2.0] drop /v2/ from api/tests/docs
This is an automated cherry-pick of #3890

/assign Ankitasw


Patch:
diff --git a/api/v1beta2/tags.go b/api/v1beta2/tags.go
index 1d620426c..b5e868c3a 100644
--- a/api/v1beta2/tags.go
+++ b/api/v1beta2/tags.go
@@ -155,7 +155,7 @@ const (
 	// NameAWSProviderPrefix is the tag prefix we use to differentiate
 	// cluster-api-provider-aws owned components from other tooling that
 	// uses NameKubernetesClusterPrefix.
-	NameAWSProviderPrefix = "sigs.k8s.io/cluster-api-provider-aws/v2/"
+	NameAWSProviderPrefix = "sigs.k8s.io/cluster-api-provider-aws/"
 
 	// NameAWSProviderOwned is the tag name we use to differentiate
 	// cluster-api-provider-aws owned components from other tooling that
diff --git a/docs/book/src/topics/accessing-ec2-instances.md b/docs/book/src/topics/accessing-ec2-instances.md
index c6ed21306..2babef987 100644
--- a/docs/book/src/topics/accessing-ec2-instances.md
+++ b/docs/book/src/topics/accessing-ec2-instances.md
@@ -147,7 +147,7 @@ Similarly, to obtain the list of private IP addresses of the cluster nodes, use
 for type in control-plane node
 do
 	aws ec2 describe-instances \
-    --filter="Name=tag:sigs.k8s.io/cluster-api-provider-aws/v2/role,\
+    --filter="Name=tag:sigs.k8s.io/cluster-api-provider-aws/role,\
     Values=${type}" \
 		| jq '.Reservations[].Instances[].PrivateIpAddress' -r
 done
@@ -161,7 +161,7 @@ Finally, to obtain AWS instance IDs for cluster nodes, you can use this AWS CLI
 for type in control-plane node
 do
 	aws ec2 describe-instances \
-    --filter="Name=tag:sigs.k8s.io/cluster-api-provider-aws/v2/role,\
+    --filter="Name=tag:sigs.k8s.io/cluster-api-provider-aws/role,\
     Values=${type}" \
 		| jq '.Reservations[].Instances[].InstanceId' -r
 done
diff --git a/docs/book/src/topics/using-clusterawsadm-to-fulfill-prerequisites.md b/docs/book/src/topics/using-clusterawsadm-to-fulfill-prerequisites.md
index 8366fe2ad..7ffc3c903 100644
--- a/docs/book/src/topics/using-clusterawsadm-to-fulfill-prerequisites.md
+++ b/docs/book/src/topics/using-clusterawsadm-to-fulfill-prerequisites.md
@@ -146,7 +146,7 @@ If you want to save the private key directly into AWS Systems Manager Parameter
 Store with KMS encryption for security, you can use the following command:
 
 ```bash
-aws ssm put-parameter --name "/sigs.k8s.io/cluster-api-provider-aws/v2/ssh-key" \
+aws ssm put-parameter --name "/sigs.k8s.io/cluster-api-provider-aws/ssh-key" \
   --type SecureString \
   --value "$(aws ec2 create-key-pair --key-name default --output json | jq .KeyMaterial -r)"
 ```


Test patch:
diff --git a/controllers/awscluster_controller_test.go b/controllers/awscluster_controller_test.go
index fb77f66f4..3d6dc808b 100644
--- a/controllers/awscluster_controller_test.go
+++ b/controllers/awscluster_controller_test.go
@@ -320,12 +320,12 @@ func mockedDescribeInstanceCall(m *mocks.MockEC2APIMockRecorder) {
 	m.DescribeInstances(gomock.Eq(&ec2.DescribeInstancesInput{
 		Filters: []*ec2.Filter{
 			{
-				Name:   aws.String("tag:sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+				Name:   aws.String("tag:sigs.k8s.io/cluster-api-provider-aws/role"),
 				Values: aws.StringSlice([]string{"bastion"}),
 			},
 			{
 				Name:   aws.String("tag-key"),
-				Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"}),
+				Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"}),
 			},
 			{
 				Name:   aws.String("instance-state-name"),
@@ -425,11 +425,11 @@ func mockedCreateVPCCalls(m *mocks.MockEC2APIMockRecorder) {
 				Value: aws.String("1"),
 			},
 			{
-				Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+				Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 				Value: aws.String("owned"),
 			},
 			{
-				Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+				Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 				Value: aws.String("public"),
 			},
 		},
@@ -455,11 +455,11 @@ func mockedCreateVPCCalls(m *mocks.MockEC2APIMockRecorder) {
 						Value: aws.String("1"),
 					},
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 						Value: aws.String("owned"),
 					},
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 						Value: aws.String("public"),
 					},
 				},
@@ -474,11 +474,11 @@ func mockedCreateVPCCalls(m *mocks.MockEC2APIMockRecorder) {
 			MapPublicIpOnLaunch: aws.Bool(false),
 			Tags: []*ec2.Tag{
 				{
-					Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+					Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 					Value: aws.String("owned"),
 				},
 				{
-					Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+					Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 					Value: aws.String("public"),
 				},
 				{
@@ -519,11 +519,11 @@ func mockedCreateVPCCalls(m *mocks.MockEC2APIMockRecorder) {
 				MapPublicIpOnLaunch: aws.Bool(false),
 				Tags: []*ec2.Tag{
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 						Value: aws.String("owned"),
 					},
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 						Value: aws.String("public"),
 					},
 					{
@@ -585,7 +585,7 @@ func mockedCreateVPCCalls(m *mocks.MockEC2APIMockRecorder) {
 					CidrBlock: aws.String("10.0.0.0/8"),
 					Tags: []*ec2.Tag{
 						{
-							Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+							Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 							Value: aws.String("common"),
 						},
 						{
@@ -632,7 +632,7 @@ func mockedDeleteVPCCalls(m *mocks.MockEC2APIMockRecorder) {
 			},
 			{
 				Name:   aws.String("tag-key"),
-				Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"}),
+				Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"}),
 			},
 		}})).Return(&ec2.DescribeRouteTablesOutput{
 		RouteTables: []*ec2.RouteTable{
@@ -686,7 +686,7 @@ func mockedDeleteVPCCalls(m *mocks.MockEC2APIMockRecorder) {
 		Filters: []*ec2.Filter{
 			{
 				Name:   aws.String("tag-key"),
-				Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"}),
+				Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"}),
 			}},
 	})).Return(&ec2.DescribeAddressesOutput{
 		Addresses: []*ec2.Address{
@@ -722,7 +722,7 @@ func mockedDeleteVPCCalls(m *mocks.MockEC2APIMockRecorder) {
 					CidrBlock: aws.String("10.0.0.0/8"),
 					Tags: []*ec2.Tag{
 						{
-							Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+							Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 							Value: aws.String("common"),
 						},
 						{
@@ -730,7 +730,7 @@ func mockedDeleteVPCCalls(m *mocks.MockEC2APIMockRecorder) {
 							Value: aws.String("test-cluster"),
 						},
 						{
-							Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+							Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 							Value: aws.String("owned"),
 						},
 					},
@@ -754,7 +754,7 @@ func mockedCreateSGCalls(m *mocks.MockEC2APIMockRecorder) {
 			},
 			{
 				Name:   aws.String("tag-key"),
-				Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"}),
+				Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"}),
 			},
 		},
 	})).Return(
@@ -779,11 +779,11 @@ func mockedCreateSGCalls(m *mocks.MockEC2APIMockRecorder) {
 						Value: aws.String("test-cluster-bastion"),
 					},
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 						Value: aws.String("owned"),
 					},
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 						Value: aws.String("bastion"),
 					},
 				},
@@ -804,11 +804,11 @@ func mockedCreateSGCalls(m *mocks.MockEC2APIMockRecorder) {
 						Value: aws.String("test-cluster-apiserver-lb"),
 					},
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 						Value: aws.String("owned"),
 					},
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 						Value: aws.String("apiserver-lb"),
 					},
 				},
@@ -833,11 +833,11 @@ func mockedCreateSGCalls(m *mocks.MockEC2APIMockRecorder) {
 						Value: aws.String("owned"),
 					},
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 						Value: aws.String("owned"),
 					},
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 						Value: aws.String("lb"),
 					},
 				},
@@ -858,11 +858,11 @@ func mockedCreateSGCalls(m *mocks.MockEC2APIMockRecorder) {
 						Value: aws.String("test-cluster-controlplane"),
 					},
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 						Value: aws.String("owned"),
 					},
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 						Value: aws.String("controlplane"),
 					},
 				},
@@ -883,11 +883,11 @@ func mockedCreateSGCalls(m *mocks.MockEC2APIMockRecorder) {
 						Value: aws.String("test-cluster-node"),
 					},
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 						Value: aws.String("owned"),
 					},
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 						Value: aws.String("node"),
 					},
 				},
diff --git a/controllers/awsmachine_controller_test.go b/controllers/awsmachine_controller_test.go
index a5c36a81e..a70cb2cd5 100644
--- a/controllers/awsmachine_controller_test.go
+++ b/controllers/awsmachine_controller_test.go
@@ -496,7 +496,7 @@ func mockedCreateInstanceCalls(m *mocks.MockEC2APIMockRecorder) {
 				Values: aws.StringSlice([]string{""}),
 			},
 			{
-				Name:   aws.String("tag:sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+				Name:   aws.String("tag:sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 				Values: aws.StringSlice([]string{"owned"}),
 			},
 			{
diff --git a/controllers/helpers_test.go b/controllers/helpers_test.go
index 202fdcedc..c58634165 100644
--- a/controllers/helpers_test.go
+++ b/controllers/helpers_test.go
@@ -66,11 +66,11 @@ var (
 			Value: lbName,
 		},
 		{
-			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 			Value: aws.String("owned"),
 		},
 		{
-			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 			Value: aws.String("apiserver"),
 		},
 	}
@@ -179,7 +179,7 @@ func mockedCreateLBCalls(t *testing.T, m *mocks.MockELBAPIMockRecorder) {
 		LoadBalancerNames: aws.StringSlice([]string{""}),
 		Tags: []*elb.TagKeyOnly{
 			{
-				Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster-apiserver"),
+				Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster-apiserver"),
 			},
 		},
 	})).MaxTimes(1)
diff --git a/pkg/cloud/services/autoscaling/autoscalinggroup_test.go b/pkg/cloud/services/autoscaling/autoscalinggroup_test.go
index 30bc0ef80..8b7dc95fa 100644
--- a/pkg/cloud/services/autoscaling/autoscalinggroup_test.go
+++ b/pkg/cloud/services/autoscaling/autoscalinggroup_test.go
@@ -460,14 +460,14 @@ func TestServiceCreateASG(t *testing.T) {
 							Value:             aws.String("owned"),
 						},
 						{
-							Key:               aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test"),
+							Key:               aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test"),
 							PropagateAtLaunch: aws.Bool(false),
 							ResourceId:        aws.String("create-asg-success"),
 							ResourceType:      aws.String("auto-scaling-group"),
 							Value:             aws.String("owned"),
 						},
 						{
-							Key:               aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+							Key:               aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 							PropagateAtLaunch: aws.Bool(false),
 							ResourceId:        aws.String("create-asg-success"),
 							ResourceType:      aws.String("auto-scaling-group"),
diff --git a/pkg/cloud/services/ec2/instances_test.go b/pkg/cloud/services/ec2/instances_test.go
index 9ebbd2d1a..b3217aa81 100644
--- a/pkg/cloud/services/ec2/instances_test.go
+++ b/pkg/cloud/services/ec2/instances_test.go
@@ -2095,11 +2095,11 @@ func TestCreateInstance(t *testing.T) {
 										Value: aws.String("owned"),
 									},
 									{
-										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test1"),
+										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test1"),
 										Value: aws.String("owned"),
 									},
 									{
-										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 										Value: aws.String("node"),
 									},
 								},
@@ -2232,11 +2232,11 @@ func TestCreateInstance(t *testing.T) {
 										Value: aws.String("owned"),
 									},
 									{
-										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test1"),
+										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test1"),
 										Value: aws.String("owned"),
 									},
 									{
-										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 										Value: aws.String("node"),
 									},
 								},
diff --git a/pkg/cloud/services/network/egress_only_gateways_test.go b/pkg/cloud/services/network/egress_only_gateways_test.go
index 79abcb9d4..254039599 100644
--- a/pkg/cloud/services/network/egress_only_gateways_test.go
+++ b/pkg/cloud/services/network/egress_only_gateways_test.go
@@ -98,7 +98,7 @@ func TestReconcileEgressOnlyInternetGateways(t *testing.T) {
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("common"),
 								},
 								{
diff --git a/pkg/cloud/services/network/gateways_test.go b/pkg/cloud/services/network/gateways_test.go
index 07e83e027..b5ae3f895 100644
--- a/pkg/cloud/services/network/gateways_test.go
+++ b/pkg/cloud/services/network/gateways_test.go
@@ -96,7 +96,7 @@ func TestReconcileInternetGateways(t *testing.T) {
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("common"),
 								},
 								{
diff --git a/pkg/cloud/services/network/natgateways_test.go b/pkg/cloud/services/network/natgateways_test.go
index 9379b24fe..cc223f185 100644
--- a/pkg/cloud/services/network/natgateways_test.go
+++ b/pkg/cloud/services/network/natgateways_test.go
@@ -123,11 +123,11 @@ func TestReconcileNatGateways(t *testing.T) {
 									Value: aws.String("test-cluster-eip-apiserver"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("apiserver"),
 								},
 							},
@@ -149,11 +149,11 @@ func TestReconcileNatGateways(t *testing.T) {
 									Value: aws.String("test-cluster-nat"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("common"),
 								},
 							},
@@ -230,11 +230,11 @@ func TestReconcileNatGateways(t *testing.T) {
 									Value: aws.String("test-cluster-eip-apiserver"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("apiserver"),
 								},
 							},
@@ -256,11 +256,11 @@ func TestReconcileNatGateways(t *testing.T) {
 									Value: aws.String("test-cluster-nat"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("common"),
 								},
 							},
@@ -318,7 +318,7 @@ func TestReconcileNatGateways(t *testing.T) {
 						SubnetId:     aws.String("subnet-1"),
 						Tags: []*ec2.Tag{
 							{
-								Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+								Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 								Value: aws.String("common"),
 							},
 							{
@@ -326,7 +326,7 @@ func TestReconcileNatGateways(t *testing.T) {
 								Value: aws.String("test-cluster-nat"),
 							},
 							{
-								Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+								Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 								Value: aws.String("owned"),
 							},
 						},
diff --git a/pkg/cloud/services/network/routetables_test.go b/pkg/cloud/services/network/routetables_test.go
index 95e4ab52b..01ed5b3b3 100644
--- a/pkg/cloud/services/network/routetables_test.go
+++ b/pkg/cloud/services/network/routetables_test.go
@@ -360,7 +360,7 @@ func TestReconcileRouteTables(t *testing.T) {
 										Value: aws.String("owned"),
 									},
 									{
-										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 										Value: aws.String("common"),
 									},
 									{
@@ -368,7 +368,7 @@ func TestReconcileRouteTables(t *testing.T) {
 										Value: aws.String("test-cluster-rt-private-us-east-1a"),
 									},
 									{
-										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 										Value: aws.String("owned"),
 									},
 								},
@@ -392,7 +392,7 @@ func TestReconcileRouteTables(t *testing.T) {
 										Value: aws.String("owned"),
 									},
 									{
-										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 										Value: aws.String("common"),
 									},
 									{
@@ -400,7 +400,7 @@ func TestReconcileRouteTables(t *testing.T) {
 										Value: aws.String("test-cluster-rt-public-us-east-1a"),
 									},
 									{
-										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 										Value: aws.String("owned"),
 									},
 								},
@@ -469,7 +469,7 @@ func TestReconcileRouteTables(t *testing.T) {
 										Value: aws.String("owned"),
 									},
 									{
-										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 										Value: aws.String("common"),
 									},
 									{
@@ -477,7 +477,7 @@ func TestReconcileRouteTables(t *testing.T) {
 										Value: aws.String("test-cluster-rt-private-us-east-1a"),
 									},
 									{
-										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 										Value: aws.String("owned"),
 									},
 								},
@@ -501,7 +501,7 @@ func TestReconcileRouteTables(t *testing.T) {
 										Value: aws.String("owned"),
 									},
 									{
-										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 										Value: aws.String("common"),
 									},
 									{
@@ -509,7 +509,7 @@ func TestReconcileRouteTables(t *testing.T) {
 										Value: aws.String("test-cluster-rt-public-us-east-1a"),
 									},
 									{
-										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 										Value: aws.String("owned"),
 									},
 								},
@@ -599,7 +599,7 @@ func TestDeleteRouteTables(t *testing.T) {
 						Value: aws.String("owned"),
 					},
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 						Value: aws.String("common"),
 					},
 					{
@@ -607,7 +607,7 @@ func TestDeleteRouteTables(t *testing.T) {
 						Value: aws.String("test-cluster-rt-public-us-east-1a"),
 					},
 					{
-						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 						Value: aws.String("owned"),
 					},
 				},
diff --git a/pkg/cloud/services/network/subnets_test.go b/pkg/cloud/services/network/subnets_test.go
index 0d1a36b3e..d6b0c0d99 100644
--- a/pkg/cloud/services/network/subnets_test.go
+++ b/pkg/cloud/services/network/subnets_test.go
@@ -784,11 +784,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("private"),
 								},
 							},
@@ -830,11 +830,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("public"),
 								},
 							},
@@ -992,11 +992,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("public"),
 								},
 							},
@@ -1047,11 +1047,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("private"),
 								},
 							},
@@ -1153,11 +1153,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("public"),
 								},
 							},
@@ -1237,11 +1237,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("private"),
 								},
 							},
@@ -1351,11 +1351,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("public"),
 								},
 							},
@@ -1406,11 +1406,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("private"),
 								},
 							},
@@ -1454,11 +1454,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("public"),
 								},
 							},
@@ -1509,11 +1509,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("private"),
 								},
 							},
@@ -1615,11 +1615,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("public"),
 								},
 							},
@@ -1670,11 +1670,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("private"),
 								},
 							},
@@ -1741,11 +1741,11 @@ func TestReconcileSubnets(t *testing.T) {
 								CidrBlock:        aws.String("10.0.0.0/17"),
 								Tags: []*ec2.Tag{
 									{
-										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 										Value: aws.String("owned"),
 									},
 									{
-										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 										Value: aws.String("public"),
 									},
 									{
@@ -1800,11 +1800,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("private"),
 								},
 							},
@@ -1907,11 +1907,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("public"),
 								},
 							},
@@ -1962,11 +1962,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("private"),
 								},
 							},
@@ -2010,11 +2010,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("public"),
 								},
 							},
@@ -2065,11 +2065,11 @@ func TestReconcileSubnets(t *testing.T) {
 									Value: aws.String("1"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("private"),
 								},
 							},
diff --git a/pkg/cloud/services/network/vpc_test.go b/pkg/cloud/services/network/vpc_test.go
index f753363cc..a9b1a5735 100644
--- a/pkg/cloud/services/network/vpc_test.go
+++ b/pkg/cloud/services/network/vpc_test.go
@@ -71,7 +71,7 @@ func TestReconcileVPC(t *testing.T) {
 	selection := infrav1.AZSelectionSchemeOrdered
 	tags := []*ec2.Tag{
 		{
-			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 			Value: aws.String("common"),
 		},
 		{
@@ -79,7 +79,7 @@ func TestReconcileVPC(t *testing.T) {
 			Value: aws.String("test-cluster-vpc"),
 		},
 		{
-			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 			Value: aws.String("owned"),
 		},
 	}
@@ -98,9 +98,9 @@ func TestReconcileVPC(t *testing.T) {
 				ID:        "vpc-exists",
 				CidrBlock: "10.0.0.0/8",
 				Tags: map[string]string{
-					"sigs.k8s.io/cluster-api-provider-aws/v2/role": "common",
+					"sigs.k8s.io/cluster-api-provider-aws/role": "common",
 					"Name": "test-cluster-vpc",
-					"sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster": "owned",
+					"sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster": "owned",
 				},
 				AvailabilityZoneUsageLimit: &usageLimit,
 				AvailabilityZoneSelection:  &selection,
@@ -140,9 +140,9 @@ func TestReconcileVPC(t *testing.T) {
 				ID:        "vpc-new",
 				CidrBlock: "10.1.0.0/16",
 				Tags: map[string]string{
-					"sigs.k8s.io/cluster-api-provider-aws/v2/role": "common",
+					"sigs.k8s.io/cluster-api-provider-aws/role": "common",
 					"Name": "test-cluster-vpc",
-					"sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster": "owned",
+					"sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster": "owned",
 				},
 				AvailabilityZoneUsageLimit: &usageLimit,
 				AvailabilityZoneSelection:  &selection,
@@ -179,9 +179,9 @@ func TestReconcileVPC(t *testing.T) {
 					PoolID:    "amazon",
 				},
 				Tags: map[string]string{
-					"sigs.k8s.io/cluster-api-provider-aws/v2/role": "common",
+					"sigs.k8s.io/cluster-api-provider-aws/role": "common",
 					"Name": "test-cluster-vpc",
-					"sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster": "owned",
+					"sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster": "owned",
 				},
 				AvailabilityZoneUsageLimit: &usageLimit,
 				AvailabilityZoneSelection:  &selection,
@@ -245,9 +245,9 @@ func TestReconcileVPC(t *testing.T) {
 					PoolID:    "my-pool",
 				},
 				Tags: map[string]string{
-					"sigs.k8s.io/cluster-api-provider-aws/v2/role": "common",
+					"sigs.k8s.io/cluster-api-provider-aws/role": "common",
 					"Name": "test-cluster-vpc",
-					"sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster": "owned",
+					"sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster": "owned",
 				},
 				AvailabilityZoneUsageLimit: &usageLimit,
 				AvailabilityZoneSelection:  &selection,
@@ -357,7 +357,7 @@ func TestReconcileVPC(t *testing.T) {
 				ID:        "unmanaged-vpc-exists",
 				CidrBlock: "10.0.0.0/8",
 				Tags: map[string]string{
-					"sigs.k8s.io/cluster-api-provider-aws/v2/role": "common",
+					"sigs.k8s.io/cluster-api-provider-aws/role": "common",
 					"Name": "test-cluster-vpc",
 				},
 				IPv6: &infrav1.IPv6{
@@ -386,7 +386,7 @@ func TestReconcileVPC(t *testing.T) {
 							},
 							Tags: []*ec2.Tag{
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("common"),
 								},
 								{
@@ -424,7 +424,7 @@ func TestReconcileVPC(t *testing.T) {
 				ID:        "unmanaged-vpc-exists",
 				CidrBlock: "10.0.0.0/8",
 				Tags: map[string]string{
-					"sigs.k8s.io/cluster-api-provider-aws/v2/role": "common",
+					"sigs.k8s.io/cluster-api-provider-aws/role": "common",
 					"Name": "test-cluster-vpc",
 				},
 				AvailabilityZoneUsageLimit: &usageLimit,
@@ -439,7 +439,7 @@ func TestReconcileVPC(t *testing.T) {
 							CidrBlock: aws.String("10.0.0.0/8"),
 							Tags: []*ec2.Tag{
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("common"),
 								},
 								{
@@ -459,9 +459,9 @@ func TestReconcileVPC(t *testing.T) {
 				ID:        "managed-vpc-exists",
 				CidrBlock: "10.0.0.0/8",
 				Tags: map[string]string{
-					"sigs.k8s.io/cluster-api-provider-aws/v2/role": "common",
+					"sigs.k8s.io/cluster-api-provider-aws/role": "common",
 					"Name": "test-cluster-vpc",
-					"sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster": "owned",
+					"sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster": "owned",
 				},
 				AvailabilityZoneUsageLimit: &usageLimit,
 				AvailabilityZoneSelection:  &selection,
@@ -588,7 +588,7 @@ func TestDeleteVPC(t *testing.T) {
 	defer mockCtrl.Finish()
 
 	tags := map[string]string{
-		"sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster": "owned",
+		"sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster": "owned",
 	}
 
 	testCases := []struct {
diff --git a/pkg/cloud/services/secretsmanager/secret_test.go b/pkg/cloud/services/secretsmanager/secret_test.go
index b5defa57a..14e346b63 100644
--- a/pkg/cloud/services/secretsmanager/secret_test.go
+++ b/pkg/cloud/services/secretsmanager/secret_test.go
@@ -64,11 +64,11 @@ func TestServiceCreate(t *testing.T) {
 			Value: aws.String("owned"),
 		},
 		{
-			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test"),
+			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test"),
 			Value: aws.String("owned"),
 		},
 		{
-			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 			Value: aws.String("node"),
 		},
 	}
diff --git a/pkg/cloud/services/securitygroup/securitygroups_test.go b/pkg/cloud/services/securitygroup/securitygroups_test.go
index fbd00c570..9e89afdd2 100644
--- a/pkg/cloud/services/securitygroup/securitygroups_test.go
+++ b/pkg/cloud/services/securitygroup/securitygroups_test.go
@@ -100,11 +100,11 @@ func TestReconcileSecurityGroups(t *testing.T) {
 									Value: aws.String("test-cluster-bastion"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("bastion"),
 								},
 							},
@@ -132,11 +132,11 @@ func TestReconcileSecurityGroups(t *testing.T) {
 									Value: aws.String("test-cluster-apiserver-lb"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("apiserver-lb"),
 								},
 							},
@@ -168,11 +168,11 @@ func TestReconcileSecurityGroups(t *testing.T) {
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("lb"),
 								},
 							},
@@ -194,11 +194,11 @@ func TestReconcileSecurityGroups(t *testing.T) {
 									Value: aws.String("test-cluster-controlplane"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("controlplane"),
 								},
 							},
@@ -226,11 +226,11 @@ func TestReconcileSecurityGroups(t *testing.T) {
 									Value: aws.String("test-cluster-node"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
 									Value: aws.String("owned"),
 								},
 								{
-									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+									Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 									Value: aws.String("node"),
 								},
 							},
diff --git a/pkg/cloud/services/ssm/secret_test.go b/pkg/cloud/services/ssm/secret_test.go
index ab1c94661..16d81d176 100644
--- a/pkg/cloud/services/ssm/secret_test.go
+++ b/pkg/cloud/services/ssm/secret_test.go
@@ -77,11 +77,11 @@ func TestServiceCreate(t *testing.T) {
 			Value: aws.String("owned"),
 		},
 		{
-			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test"),
+			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test"),
 			Value: aws.String("owned"),
 		},
 		{
-			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 			Value: aws.String("node"),
 		},
 	}
diff --git a/pkg/cloud/tags/tags_test.go b/pkg/cloud/tags/tags_test.go
index 024995988..8d0e70c24 100644
--- a/pkg/cloud/tags/tags_test.go
+++ b/pkg/cloud/tags/tags_test.go
@@ -50,11 +50,11 @@ var (
 			Value: aws.String("v1"),
 		},
 		{
-			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/testcluster"),
+			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/testcluster"),
 			Value: aws.String("owned"),
 		},
 		{
-			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
+			Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
 			Value: aws.String("testrole"),
 		},
 	}
@@ -202,7 +202,7 @@ func TestTagsEnsureWithEKS(t *testing.T) {
 			expect: func(m *mock_eksiface.MockEKSAPIMockRecorder) {
 				m.TagResource(gomock.Eq(&eks.TagResourceInput{
 					ResourceArn: aws.String(""),
-					Tags:        map[string]*string{"Name": aws.String("test"), "k1": aws.String("v1"), "sigs.k8s.io/cluster-api-provider-aws/v2/cluster/testcluster": aws.String("owned"), "sigs.k8s.io/cluster-api-provider-aws/v2/role": aws.String("testrole")},
+					Tags:        map[string]*string{"Name": aws.String("test"), "k1": aws.String("v1"), "sigs.k8s.io/cluster-api-provider-aws/cluster/testcluster": aws.String("owned"), "sigs.k8s.io/cluster-api-provider-aws/role": aws.String("testrole")},
 				})).Return(nil, errors.New("failed to tag resource"))
 			},
 		},
@@ -212,7 +212,7 @@ func TestTagsEnsureWithEKS(t *testing.T) {
 			expect: func(m *mock_eksiface.MockEKSAPIMockRecorder) {
 				m.TagResource(gomock.Eq(&eks.TagResourceInput{
 					ResourceArn: aws.String(""),
-					Tags:        map[string]*string{"Name": aws.String("test"), "k1": aws.String("v1"), "sigs.k8s.io/cluster-api-provider-aws/v2/cluster/testcluster": aws.String("owned"), "sigs.k8s.io/cluster-api-provider-aws/v2/role": aws.String("testrole")},
+					Tags:        map[string]*string{"Name": aws.String("test"), "k1": aws.String("v1"), "sigs.k8s.io/cluster-api-provider-aws/cluster/testcluster": aws.String("owned"), "sigs.k8s.io/cluster-api-provider-aws/role": aws.String("testrole")},
 				})).Return(nil, nil)
 			},
 		},
diff --git a/test/e2e/shared/aws.go b/test/e2e/shared/aws.go
index f25ca9658..b1a91f9c1 100644
--- a/test/e2e/shared/aws.go
+++ b/test/e2e/shared/aws.go
@@ -991,7 +991,7 @@ func ListClusterEC2Instances(e2eCtx *E2EContext, clusterName string) ([]*ec2.Ins
 	ec2Svc := ec2.New(e2eCtx.AWSSession)
 	filter := &ec2.Filter{
 		Name:   aws.String("tag-key"),
-		Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/v2/cluster/" + clusterName}),
+		Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/cluster/" + clusterName}),
 	}
 	input := &ec2.DescribeInstancesInput{
 		Filters: []*ec2.Filter{