Merge pull request #5474 from giantswarm/dont-overwrite-subnet-tags

🐛 Don't overwrite subnet spec tags with AWS tags

Author: k8s-ci-robot

pkg/cloud/services/network/subnets.go

@@ -133,6 +133,7 @@ func (s *Service) reconcileSubnets() error {
 
 			// Update subnet spec with the existing subnet details
 			existingSubnet.DeepCopyInto(sub)
+			sub.Tags = subnetTags
 
 			if err := wait.WaitForWithRetryable(wait.NewBackoff(), func() (bool, error) {
 				buildParams := s.getSubnetTagParams(unmanagedVPC, existingSubnet.GetResourceID(), existingSubnet.IsPublic, existingSubnet.AvailabilityZone, subnetTags, existingSubnet.IsEdge())

pkg/cloud/services/network/subnets_test.go

@@ -676,7 +676,6 @@ func TestReconcileSubnets(t *testing.T) {
 					AvailabilityZone: "us-east-1a",
 					CidrBlock:        "10.0.10.0/24",
 					IsPublic:         true,
-					Tags:             infrav1.Tags{},
 				},
 			},
 			expect: func(m *mocks.MockEC2APIMockRecorder) {
@@ -782,15 +781,13 @@ func TestReconcileSubnets(t *testing.T) {
 					AvailabilityZone: "us-east-1a",
 					CidrBlock:        "10.0.10.0/24",
 					IsPublic:         true,
-					Tags:             infrav1.Tags{},
 				},
 				{
 					ID:               "subnet-2",
 					ResourceID:       "subnet-2",
 					AvailabilityZone: "us-east-1b",
 					CidrBlock:        "10.0.11.0/24",
 					IsPublic:         true,
-					Tags:             infrav1.Tags{},
 				},
 			},
 			expect: func(m *mocks.MockEC2APIMockRecorder) {
@@ -4144,10 +4141,7 @@ func TestDiscoverSubnets(t *testing.T) {
 					CidrBlock:        "10.0.10.0/24",
 					IsPublic:         true,
 					RouteTableID:     aws.String("rtb-1"),
-					Tags: infrav1.Tags{
-						"Name": "provided-subnet-public",
-					},
-					ZoneType: ptr.To[infrav1.ZoneType]("availability-zone"),
+					ZoneType:         ptr.To[infrav1.ZoneType]("availability-zone"),
 				},
 				{
 					ID:               "subnet-2",
@@ -4156,10 +4150,7 @@ func TestDiscoverSubnets(t *testing.T) {
 					CidrBlock:        "10.0.11.0/24",
 					IsPublic:         false,
 					RouteTableID:     aws.String("rtb-2"),
-					Tags: infrav1.Tags{
-						"Name": "provided-subnet-private",
-					},
-					ZoneType: ptr.To[infrav1.ZoneType]("availability-zone"),
+					ZoneType:         ptr.To[infrav1.ZoneType]("availability-zone"),
 				},
 			},
 		},