Merge pull request #4566 from vincepri/elbv2tags

🐛 ELBv2 target groups should inherit tags
kubernetes-sigs · Oct 11, 2023 · ba876fa · ba876fa
2 parents 35f8bec + db4a0da
commit ba876fa
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/pkg/cloud/services/elb/loadbalancer.go b/pkg/cloud/services/elb/loadbalancer.go
@@ -273,6 +273,7 @@ func (s *Service) createLB(spec *infrav1.LoadBalancer) (*infrav1.LoadBalancer, e
 			Port:     aws.Int64(ln.TargetGroup.Port),
 			Protocol: aws.String(ln.TargetGroup.Protocol.String()),
 			VpcId:    aws.String(ln.TargetGroup.VpcID),
+			Tags:     input.Tags,
 		}
 		if s.scope.VPC().IsIPv6Enabled() {
 			targetGroupInput.IpAddressType = aws.String("ipv6")

diff --git a/pkg/cloud/services/elb/loadbalancer_test.go b/pkg/cloud/services/elb/loadbalancer_test.go
@@ -1047,6 +1047,12 @@ func TestCreateNLB(t *testing.T) {
 					Port:                aws.Int64(infrav1.DefaultAPIServerPort),
 					Protocol:            aws.String("TCP"),
 					VpcId:               aws.String(vpcID),
+					Tags: []*elbv2.Tag{
+						{
+							Key:   aws.String("test"),
+							Value: aws.String("tag"),
+						},
+					},
 				})).Return(&elbv2.CreateTargetGroupOutput{
 					TargetGroups: []*elbv2.TargetGroup{
 						{
@@ -1143,6 +1149,12 @@ func TestCreateNLB(t *testing.T) {
 					Protocol:            aws.String("TCP"),
 					VpcId:               aws.String(vpcID),
 					IpAddressType:       aws.String("ipv6"),
+					Tags: []*elbv2.Tag{
+						{
+							Key:   aws.String("test"),
+							Value: aws.String("tag"),
+						},
+					},
 				})).Return(&elbv2.CreateTargetGroupOutput{
 					TargetGroups: []*elbv2.TargetGroup{
 						{
@@ -1274,6 +1286,12 @@ func TestCreateNLB(t *testing.T) {
 					Port:     aws.Int64(infrav1.DefaultAPIServerPort),
 					Protocol: aws.String("TCP"),
 					VpcId:    aws.String(vpcID),
+					Tags: []*elbv2.Tag{
+						{
+							Key:   aws.String("test"),
+							Value: aws.String("tag"),
+						},
+					},
 				})).Return(&elbv2.CreateTargetGroupOutput{
 					TargetGroups: []*elbv2.TargetGroup{
 						{
@@ -1365,6 +1383,12 @@ func TestCreateNLB(t *testing.T) {
 					Port:                aws.Int64(infrav1.DefaultAPIServerPort),
 					Protocol:            aws.String("TCP"),
 					VpcId:               aws.String(vpcID),
+					Tags: []*elbv2.Tag{
+						{
+							Key:   aws.String("test"),
+							Value: aws.String("tag"),
+						},
+					},
 				})).Return(&elbv2.CreateTargetGroupOutput{
 					TargetGroups: []*elbv2.TargetGroup{
 						{
@@ -1449,6 +1473,12 @@ func TestCreateNLB(t *testing.T) {
 					Port:                aws.Int64(infrav1.DefaultAPIServerPort),
 					Protocol:            aws.String("TCP"),
 					VpcId:               aws.String(vpcID),
+					Tags: []*elbv2.Tag{
+						{
+							Key:   aws.String("test"),
+							Value: aws.String("tag"),
+						},
+					},
 				})).Return(&elbv2.CreateTargetGroupOutput{
 					TargetGroups: []*elbv2.TargetGroup{
 						{