Merge pull request #3838 from Skarlso/add_ccm_to_route_tables

Add CCM tag to routing tables

Author: k8s-ci-robot

pkg/cloud/services/network/routetables.go

@@ -364,12 +364,15 @@ func (s *Service) getRouteTableTagParams(id string, public bool, zone string) in
 	name.WriteString("-")
 	name.WriteString(zone)
 
+	additionalTags := s.scope.AdditionalTags()
+	additionalTags[infrav1.ClusterAWSCloudProviderTagKey(s.scope.KubernetesClusterName())] = string(infrav1.ResourceLifecycleOwned)
+
 	return infrav1.BuildParams{
 		ClusterName: s.scope.Name(),
 		ResourceID:  id,
 		Lifecycle:   infrav1.ResourceLifecycleOwned,
 		Name:        aws.String(name.String()),
 		Role:        aws.String(infrav1.CommonRoleTagValue),
-		Additional:  s.scope.AdditionalTags(),
+		Additional:  additionalTags,
 	}
 }

pkg/cloud/services/network/routetables_test.go

@@ -355,6 +355,10 @@ func TestReconcileRouteTables(t *testing.T) {
 									},
 								},
 								Tags: []*ec2.Tag{
+									{
+										Key:   aws.String("kubernetes.io/cluster/test-cluster"),
+										Value: aws.String("owned"),
+									},
 									{
 										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
 										Value: aws.String("common"),
@@ -383,6 +387,10 @@ func TestReconcileRouteTables(t *testing.T) {
 									},
 								},
 								Tags: []*ec2.Tag{
+									{
+										Key:   aws.String("kubernetes.io/cluster/test-cluster"),
+										Value: aws.String("owned"),
+									},
 									{
 										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
 										Value: aws.String("common"),
@@ -456,6 +464,10 @@ func TestReconcileRouteTables(t *testing.T) {
 									},
 								},
 								Tags: []*ec2.Tag{
+									{
+										Key:   aws.String("kubernetes.io/cluster/test-cluster"),
+										Value: aws.String("owned"),
+									},
 									{
 										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
 										Value: aws.String("common"),
@@ -484,6 +496,10 @@ func TestReconcileRouteTables(t *testing.T) {
 									},
 								},
 								Tags: []*ec2.Tag{
+									{
+										Key:   aws.String("kubernetes.io/cluster/test-cluster"),
+										Value: aws.String("owned"),
+									},
 									{
 										Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
 										Value: aws.String("common"),
@@ -578,6 +594,10 @@ func TestDeleteRouteTables(t *testing.T) {
 					},
 				},
 				Tags: []*ec2.Tag{
+					{
+						Key:   aws.String("kubernetes.io/cluster/test-cluster"),
+						Value: aws.String("owned"),
+					},
 					{
 						Key:   aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
 						Value: aws.String("common"),

pkg/cloud/services/network/subnets.go

@@ -503,7 +503,7 @@ func (s *Service) getSubnetTagParams(unmanagedVPC bool, id string, public bool,
 	}
 
 	// Add tag needed for Service type=LoadBalancer
-	additionalTags[infrav1.NameKubernetesAWSCloudProviderPrefix+s.scope.KubernetesClusterName()] = string(infrav1.ResourceLifecycleShared)
+	additionalTags[infrav1.ClusterAWSCloudProviderTagKey(s.scope.KubernetesClusterName())] = string(infrav1.ResourceLifecycleShared)
 
 	if !unmanagedVPC {
 		for k, v := range manualTags {