Merge pull request #5004 from nrb/fix-5002

🐛 Reconcile target groups and listeners as their own entities
kubernetes-sigs · Jun 11, 2024 · daedbe0 · daedbe0
2 parents f04cb3e + cc2cfe4
commit daedbe0
Show file tree

Hide file tree

Showing 5 changed files with 923 additions and 376 deletions.
diff --git a/controllers/awscluster_controller_test.go b/controllers/awscluster_controller_test.go
@@ -303,6 +303,11 @@ func TestAWSClusterReconcilerIntegrationTests(t *testing.T) {
 			mockedCreateLBV2Calls(t, e)
 			mockedDescribeInstanceCall(m)
 			mockedDescribeAvailabilityZones(m, []string{"us-east-1c", "us-east-1a"})
+			mockedDescribeTargetGroupsCall(t, e)
+			mockedCreateTargetGroupCall(t, e)
+			mockedModifyTargetGroupAttributes(t, e)
+			mockedDescribeListenersCall(t, e)
+			mockedCreateListenerCall(t, e)
 		}
 
 		expect(ec2Mock.EXPECT(), elbv2Mock.EXPECT())

diff --git a/controllers/helpers_test.go b/controllers/helpers_test.go
@@ -29,6 +29,7 @@ import (
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/scope"
+	"sigs.k8s.io/cluster-api-provider-aws/v2/test/helpers"
 	"sigs.k8s.io/cluster-api-provider-aws/v2/test/mocks"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/util/conditions"
@@ -39,6 +40,7 @@ const DNSName = "www.google.com"
 var (
 	lbName          = aws.String("test-cluster-apiserver")
 	lbArn           = aws.String("loadbalancer::arn")
+	tgArn           = aws.String("arn::target-group")
 	describeLBInput = &elb.DescribeLoadBalancersInput{
 		LoadBalancerNames: aws.StringSlice([]string{"test-cluster-apiserver"}),
 	}
@@ -291,6 +293,157 @@ func mockedCreateLBV2Calls(t *testing.T, m *mocks.MockELBV2APIMockRecorder) {
 	})).MaxTimes(1)
 }
 
+func mockedDescribeTargetGroupsCall(t *testing.T, m *mocks.MockELBV2APIMockRecorder) {
+	t.Helper()
+	m.DescribeTargetGroups(gomock.Eq(&elbv2.DescribeTargetGroupsInput{
+		LoadBalancerArn: lbArn,
+	})).
+		Return(&elbv2.DescribeTargetGroupsOutput{
+			NextMarker: new(string),
+			TargetGroups: []*elbv2.TargetGroup{
+				{
+					HealthCheckEnabled:         aws.Bool(true),
+					HealthCheckIntervalSeconds: new(int64),
+					HealthCheckPath:            new(string),
+					HealthCheckPort:            new(string),
+					HealthCheckProtocol:        new(string),
+					HealthCheckTimeoutSeconds:  new(int64),
+					HealthyThresholdCount:      new(int64),
+					IpAddressType:              new(string),
+					LoadBalancerArns:           []*string{lbArn},
+					Matcher:                    &elbv2.Matcher{},
+					Port:                       new(int64),
+					Protocol:                   new(string),
+					ProtocolVersion:            new(string),
+					TargetGroupArn:             tgArn,
+					TargetGroupName:            new(string),
+					TargetType:                 new(string),
+					UnhealthyThresholdCount:    new(int64),
+					VpcId:                      new(string),
+				}},
+		}, nil)
+}
+
+func mockedCreateTargetGroupCall(t *testing.T, m *mocks.MockELBV2APIMockRecorder) {
+	t.Helper()
+	m.CreateTargetGroup(helpers.PartialMatchCreateTargetGroupInput(t, &elbv2.CreateTargetGroupInput{
+		HealthCheckEnabled:         aws.Bool(true),
+		HealthCheckIntervalSeconds: aws.Int64(infrav1.DefaultAPIServerHealthCheckIntervalSec),
+		HealthCheckPort:            aws.String(infrav1.DefaultAPIServerPortString),
+		HealthCheckProtocol:        aws.String("TCP"),
+		HealthCheckTimeoutSeconds:  aws.Int64(infrav1.DefaultAPIServerHealthCheckTimeoutSec),
+		HealthyThresholdCount:      aws.Int64(infrav1.DefaultAPIServerHealthThresholdCount),
+		// Note: this is treated as a prefix with the partial matcher.
+		Name:     aws.String("apiserver-target"),
+		Port:     aws.Int64(infrav1.DefaultAPIServerPort),
+		Protocol: aws.String("TCP"),
+		Tags: []*elbv2.Tag{
+			{
+				Key:   aws.String("Name"),
+				Value: aws.String("bar-apiserver"),
+			},
+			{
+				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/role"),
+				Value: aws.String("apiserver"),
+			},
+		},
+		UnhealthyThresholdCount: aws.Int64(infrav1.DefaultAPIServerUnhealthThresholdCount),
+		VpcId:                   aws.String("vpc-exists"),
+	})).Return(&elbv2.CreateTargetGroupOutput{
+		TargetGroups: []*elbv2.TargetGroup{{
+			HealthCheckEnabled:         aws.Bool(true),
+			HealthCheckIntervalSeconds: aws.Int64(infrav1.DefaultAPIServerHealthCheckIntervalSec),
+			HealthCheckPort:            aws.String(infrav1.DefaultAPIServerPortString),
+			HealthCheckProtocol:        aws.String("TCP"),
+			HealthCheckTimeoutSeconds:  aws.Int64(infrav1.DefaultAPIServerHealthCheckTimeoutSec),
+			HealthyThresholdCount:      aws.Int64(infrav1.DefaultAPIServerHealthThresholdCount),
+			LoadBalancerArns:           []*string{lbArn},
+			Matcher:                    &elbv2.Matcher{},
+			Port:                       aws.Int64(infrav1.DefaultAPIServerPort),
+			Protocol:                   aws.String("TCP"),
+			TargetGroupArn:             tgArn,
+			TargetGroupName:            aws.String("apiserver-target"),
+			UnhealthyThresholdCount:    aws.Int64(infrav1.DefaultAPIServerUnhealthThresholdCount),
+			VpcId:                      aws.String("vpc-exists"),
+		}},
+	}, nil)
+}
+
+func mockedModifyTargetGroupAttributes(t *testing.T, m *mocks.MockELBV2APIMockRecorder) {
+	t.Helper()
+	m.ModifyTargetGroupAttributes(gomock.Eq(&elbv2.ModifyTargetGroupAttributesInput{
+		TargetGroupArn: tgArn,
+		Attributes: []*elbv2.TargetGroupAttribute{
+			{
+				Key:   aws.String(infrav1.TargetGroupAttributeEnablePreserveClientIP),
+				Value: aws.String("false"),
+			},
+		},
+	})).Return(nil, nil)
+}
+
+func mockedDescribeListenersCall(t *testing.T, m *mocks.MockELBV2APIMockRecorder) {
+	t.Helper()
+	m.DescribeListeners(gomock.Eq(&elbv2.DescribeListenersInput{
+		LoadBalancerArn: lbArn,
+	})).
+		Return(&elbv2.DescribeListenersOutput{
+			Listeners: []*elbv2.Listener{{
+				DefaultActions: []*elbv2.Action{{
+					TargetGroupArn: aws.String("arn::targetgroup-not-found"),
+				}},
+				ListenerArn:     aws.String("arn::listener"),
+				LoadBalancerArn: lbArn,
+			}},
+		}, nil)
+}
+
+func mockedCreateListenerCall(t *testing.T, m *mocks.MockELBV2APIMockRecorder) {
+	t.Helper()
+	m.CreateListener(gomock.Eq(&elbv2.CreateListenerInput{
+		DefaultActions: []*elbv2.Action{
+			{
+				TargetGroupArn: tgArn,
+				Type:           aws.String(elbv2.ActionTypeEnumForward),
+			},
+		},
+		LoadBalancerArn: lbArn,
+		Port:            aws.Int64(infrav1.DefaultAPIServerPort),
+		Protocol:        aws.String("TCP"),
+		Tags: []*elbv2.Tag{
+			{
+				Key:   aws.String("Name"),
+				Value: aws.String("test-cluster-apiserver"),
+			},
+			{
+				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/role"),
+				Value: aws.String("apiserver"),
+			},
+		},
+	})).Return(&elbv2.CreateListenerOutput{
+		Listeners: []*elbv2.Listener{
+			{
+				DefaultActions: []*elbv2.Action{
+					{
+						TargetGroupArn: tgArn,
+						Type:           aws.String(elbv2.ActionTypeEnumForward),
+					},
+				},
+				ListenerArn: aws.String("listener::arn"),
+				Port:        aws.Int64(infrav1.DefaultAPIServerPort),
+				Protocol:    aws.String("TCP"),
+			},
+		}}, nil)
+}
+
 func mockedDeleteLBCalls(expectV2Call bool, mv2 *mocks.MockELBV2APIMockRecorder, m *mocks.MockELBAPIMockRecorder) {
 	if expectV2Call {
 		mv2.DescribeLoadBalancers(gomock.Any()).Return(describeLBOutputV2, nil)