Skip to content

Commit 6e43273

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #5051 from r4f4/fix-5050
🐛 subnets: use "owned" k8s tag value for managed subnets.
2 parents c383c6e + 60dea7e commit 6e43273

File tree

4 files changed

+32
-28
lines changed

4 files changed

+32
-28
lines changed

‎controllers/awscluster_controller_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ func mockedCallsForMissingEverything(m *mocks.MockEC2APIMockRecorder, e *mocks.M
10041004
},
10051005
{
10061006
Key: aws.String("kubernetes.io/cluster/test-cluster"),
1007-
Value: aws.String("shared"),
1007+
Value: aws.String("owned"),
10081008
},
10091009
{
10101010
Key: aws.String("kubernetes.io/role/internal-elb"),
@@ -1035,7 +1035,7 @@ func mockedCallsForMissingEverything(m *mocks.MockEC2APIMockRecorder, e *mocks.M
10351035
},
10361036
{
10371037
Key: aws.String("kubernetes.io/cluster/test-cluster"),
1038-
Value: aws.String("shared"),
1038+
Value: aws.String("owned"),
10391039
},
10401040
{
10411041
Key: aws.String("kubernetes.io/role/internal-elb"),
@@ -1071,7 +1071,7 @@ func mockedCallsForMissingEverything(m *mocks.MockEC2APIMockRecorder, e *mocks.M
10711071
},
10721072
{
10731073
Key: aws.String("kubernetes.io/cluster/test-cluster"),
1074-
Value: aws.String("shared"),
1074+
Value: aws.String("owned"),
10751075
},
10761076
{
10771077
Key: aws.String("kubernetes.io/role/elb"),
@@ -1102,7 +1102,7 @@ func mockedCallsForMissingEverything(m *mocks.MockEC2APIMockRecorder, e *mocks.M
11021102
},
11031103
{
11041104
Key: aws.String("kubernetes.io/cluster/test-cluster"),
1105-
Value: aws.String("shared"),
1105+
Value: aws.String("owned"),
11061106
},
11071107
{
11081108
Key: aws.String("kubernetes.io/role/elb"),

‎controlplane/eks/controllers/awsmanagedcontrolplane_controller_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ func mockedCallsForMissingEverything(ec2Rec *mocks.MockEC2APIMockRecorder, subne
358358
},
359359
{
360360
Key: aws.String("kubernetes.io/cluster/test-cluster"),
361-
Value: aws.String("shared"),
361+
Value: aws.String("owned"),
362362
},
363363
{
364364
Key: aws.String(kubernetesRoleTagKey),
@@ -390,7 +390,7 @@ func mockedCallsForMissingEverything(ec2Rec *mocks.MockEC2APIMockRecorder, subne
390390
},
391391
{
392392
Key: aws.String("kubernetes.io/cluster/test-cluster"),
393-
Value: aws.String("shared"),
393+
Value: aws.String("owned"),
394394
},
395395
{
396396
Key: aws.String("kubernetes.io/role/elb"),

‎pkg/cloud/services/network/subnets.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,11 @@ func (s *Service) getSubnetTagParams(unmanagedVPC bool, id string, public bool,
631631
}
632632
}
633633
// Add tag needed for Service type=LoadBalancer
634-
additionalTags[infrav1.ClusterAWSCloudProviderTagKey(s.scope.KubernetesClusterName())] = string(infrav1.ResourceLifecycleShared)
634+
if unmanagedVPC {
635+
additionalTags[infrav1.ClusterAWSCloudProviderTagKey(s.scope.KubernetesClusterName())] = string(infrav1.ResourceLifecycleShared)
636+
} else {
637+
additionalTags[infrav1.ClusterAWSCloudProviderTagKey(s.scope.KubernetesClusterName())] = string(infrav1.ResourceLifecycleOwned)
638+
}
635639
}
636640

637641
if !unmanagedVPC {

‎pkg/cloud/services/network/subnets_test.go

+21-21
Original file line numberDiff line numberDiff line change
@@ -1345,7 +1345,7 @@ func TestReconcileSubnets(t *testing.T) {
13451345
},
13461346
{
13471347
Key: aws.String("kubernetes.io/cluster/test-cluster"),
1348-
Value: aws.String("shared"),
1348+
Value: aws.String("owned"),
13491349
},
13501350
{
13511351
Key: aws.String("kubernetes.io/role/internal-elb"),
@@ -1391,7 +1391,7 @@ func TestReconcileSubnets(t *testing.T) {
13911391
},
13921392
{
13931393
Key: aws.String("kubernetes.io/cluster/test-cluster"),
1394-
Value: aws.String("shared"),
1394+
Value: aws.String("owned"),
13951395
},
13961396
{
13971397
Key: aws.String("kubernetes.io/role/elb"),
@@ -1584,7 +1584,7 @@ func TestReconcileSubnets(t *testing.T) {
15841584
},
15851585
{
15861586
Key: aws.String("kubernetes.io/cluster/test-cluster"),
1587-
Value: aws.String("shared"),
1587+
Value: aws.String("owned"),
15881588
},
15891589
{
15901590
Key: aws.String("kubernetes.io/role/elb"),
@@ -1639,7 +1639,7 @@ func TestReconcileSubnets(t *testing.T) {
16391639
},
16401640
{
16411641
Key: aws.String("kubernetes.io/cluster/test-cluster"),
1642-
Value: aws.String("shared"),
1642+
Value: aws.String("owned"),
16431643
},
16441644
{
16451645
Key: aws.String("kubernetes.io/role/internal-elb"),
@@ -1758,7 +1758,7 @@ func TestReconcileSubnets(t *testing.T) {
17581758
},
17591759
{
17601760
Key: aws.String("kubernetes.io/cluster/test-cluster"),
1761-
Value: aws.String("shared"),
1761+
Value: aws.String("owned"),
17621762
},
17631763
{
17641764
Key: aws.String("kubernetes.io/role/elb"),
@@ -1842,7 +1842,7 @@ func TestReconcileSubnets(t *testing.T) {
18421842
},
18431843
{
18441844
Key: aws.String("kubernetes.io/cluster/test-cluster"),
1845-
Value: aws.String("shared"),
1845+
Value: aws.String("owned"),
18461846
},
18471847
{
18481848
Key: aws.String("kubernetes.io/role/internal-elb"),
@@ -1981,7 +1981,7 @@ func TestReconcileSubnets(t *testing.T) {
19811981
},
19821982
{
19831983
Key: aws.String("kubernetes.io/cluster/test-cluster"),
1984-
Value: aws.String("shared"),
1984+
Value: aws.String("owned"),
19851985
},
19861986
{
19871987
Key: aws.String("kubernetes.io/role/elb"),
@@ -2036,7 +2036,7 @@ func TestReconcileSubnets(t *testing.T) {
20362036
},
20372037
{
20382038
Key: aws.String("kubernetes.io/cluster/test-cluster"),
2039-
Value: aws.String("shared"),
2039+
Value: aws.String("owned"),
20402040
},
20412041
{
20422042
Key: aws.String("kubernetes.io/role/internal-elb"),
@@ -2095,7 +2095,7 @@ func TestReconcileSubnets(t *testing.T) {
20952095
},
20962096
{
20972097
Key: aws.String("kubernetes.io/cluster/test-cluster"),
2098-
Value: aws.String("shared"),
2098+
Value: aws.String("owned"),
20992099
},
21002100
{
21012101
Key: aws.String("kubernetes.io/role/elb"),
@@ -2150,7 +2150,7 @@ func TestReconcileSubnets(t *testing.T) {
21502150
},
21512151
{
21522152
Key: aws.String("kubernetes.io/cluster/test-cluster"),
2153-
Value: aws.String("shared"),
2153+
Value: aws.String("owned"),
21542154
},
21552155
{
21562156
Key: aws.String("kubernetes.io/role/internal-elb"),
@@ -2254,7 +2254,7 @@ func TestReconcileSubnets(t *testing.T) {
22542254
},
22552255
{
22562256
Key: aws.String("kubernetes.io/cluster/test-cluster"),
2257-
Value: aws.String("shared"),
2257+
Value: aws.String("owned"),
22582258
},
22592259
{
22602260
Key: aws.String("kubernetes.io/role/elb"),
@@ -2309,7 +2309,7 @@ func TestReconcileSubnets(t *testing.T) {
23092309
},
23102310
{
23112311
Key: aws.String("kubernetes.io/cluster/test-cluster"),
2312-
Value: aws.String("shared"),
2312+
Value: aws.String("owned"),
23132313
},
23142314
{
23152315
Key: aws.String("kubernetes.io/role/internal-elb"),
@@ -2400,7 +2400,7 @@ func TestReconcileSubnets(t *testing.T) {
24002400
},
24012401
{
24022402
Key: aws.String("kubernetes.io/cluster/test-cluster"),
2403-
Value: aws.String("shared"),
2403+
Value: aws.String("owned"),
24042404
},
24052405
},
24062406
},
@@ -2439,7 +2439,7 @@ func TestReconcileSubnets(t *testing.T) {
24392439
},
24402440
{
24412441
Key: aws.String("kubernetes.io/cluster/test-cluster"),
2442-
Value: aws.String("shared"),
2442+
Value: aws.String("owned"),
24432443
},
24442444
{
24452445
Key: aws.String("kubernetes.io/role/internal-elb"),
@@ -2542,7 +2542,7 @@ func TestReconcileSubnets(t *testing.T) {
25422542
},
25432543
{
25442544
Key: aws.String("kubernetes.io/cluster/test-cluster"),
2545-
Value: aws.String("shared"),
2545+
Value: aws.String("owned"),
25462546
},
25472547
},
25482548
},
@@ -2581,7 +2581,7 @@ func TestReconcileSubnets(t *testing.T) {
25812581
},
25822582
{
25832583
Key: aws.String("kubernetes.io/cluster/test-cluster"),
2584-
Value: aws.String("shared"),
2584+
Value: aws.String("owned"),
25852585
},
25862586
{
25872587
Key: aws.String("kubernetes.io/role/internal-elb"),
@@ -2711,7 +2711,7 @@ func TestReconcileSubnets(t *testing.T) {
27112711
},
27122712
{
27132713
Key: aws.String("kubernetes.io/cluster/test-eks-cluster"),
2714-
Value: aws.String("shared"),
2714+
Value: aws.String("owned"),
27152715
},
27162716
{
27172717
Key: aws.String("kubernetes.io/role/elb"),
@@ -2766,7 +2766,7 @@ func TestReconcileSubnets(t *testing.T) {
27662766
},
27672767
{
27682768
Key: aws.String("kubernetes.io/cluster/test-eks-cluster"),
2769-
Value: aws.String("shared"),
2769+
Value: aws.String("owned"),
27702770
},
27712771
{
27722772
Key: aws.String("kubernetes.io/role/internal-elb"),
@@ -2813,7 +2813,7 @@ func TestReconcileSubnets(t *testing.T) {
28132813
},
28142814
{
28152815
Key: aws.String("kubernetes.io/cluster/test-eks-cluster"),
2816-
Value: aws.String("shared"),
2816+
Value: aws.String("owned"),
28172817
},
28182818
{
28192819
Key: aws.String("kubernetes.io/role/elb"),
@@ -2880,7 +2880,7 @@ func TestReconcileSubnets(t *testing.T) {
28802880
},
28812881
{
28822882
Key: aws.String("kubernetes.io/cluster/test-eks-cluster"),
2883-
Value: aws.String("shared"),
2883+
Value: aws.String("owned"),
28842884
},
28852885
{
28862886
Key: aws.String("kubernetes.io/role/internal-elb"),
@@ -3803,7 +3803,7 @@ func TestService_retrieveZoneInfo(t *testing.T) {
38033803
func stubGetTags(prefix, role, zone string, isEdge bool) []*ec2.Tag {
38043804
tags := []*ec2.Tag{
38053805
{Key: aws.String("Name"), Value: aws.String(fmt.Sprintf("%s-subnet-%s-%s", prefix, role, zone))},
3806-
{Key: aws.String("kubernetes.io/cluster/test-cluster"), Value: aws.String("shared")},
3806+
{Key: aws.String("kubernetes.io/cluster/test-cluster"), Value: aws.String("owned")},
38073807
}
38083808
// tags are returned ordered, inserting LB subnets to prevent diffs...
38093809
if !isEdge {

0 commit comments

Comments
 (0)