Skip to content

🐛 Enable NLB connection draining for graceful apiserver shutdown. #5589

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 16, 2025
Merged

🐛 Enable NLB connection draining for graceful apiserver shutdown. #5589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions api/v1beta2/network_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,14 @@ type TargetGroupAttribute string
var (
// TargetGroupAttributeEnablePreserveClientIP defines the attribute key for enabling preserve client IP.
TargetGroupAttributeEnablePreserveClientIP = "preserve_client_ip.enabled"

// TargetGroupAttributeEnableConnectionTermination defines the attribute key for terminating
// established connections to unhealthy targets.
TargetGroupAttributeEnableConnectionTermination = "target_health_state.unhealthy.connection_termination.enabled"

// TargetGroupAttributeUnhealthyDrainingIntervalSeconds defines the attribute key for the
// unhealthy target connection draining interval.
TargetGroupAttributeUnhealthyDrainingIntervalSeconds = "target_health_state.unhealthy.draining_interval_seconds"
)

// LoadBalancerAttribute defines a set of attributes for a V2 load balancer.
Expand Down
8 changes: 8 additions & 0 deletions controllers/helpers_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,14 @@ func mockedModifyTargetGroupAttributes(t *testing.T, m *mocks.MockELBV2APIMockRe
m.ModifyTargetGroupAttributes(gomock.Any(), gomock.Eq(&elbv2.ModifyTargetGroupAttributesInput{
TargetGroupArn: tgArn,
Attributes: []elbv2types.TargetGroupAttribute{
{
Key: aws.String(infrav1.TargetGroupAttributeEnableConnectionTermination),
Value: aws.String("false"),
},
{
Key: aws.String(infrav1.TargetGroupAttributeUnhealthyDrainingIntervalSeconds),
Value: aws.String("300"),
},
{
Key: aws.String(infrav1.TargetGroupAttributeEnablePreserveClientIP),
Value: aws.String("false"),
Expand Down
32 changes: 24 additions & 8 deletions pkg/cloud/services/elb/loadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1687,16 +1687,32 @@ func (s *Service) reconcileTargetGroupsAndListeners(ctx context.Context, lbARN s
}
createdTargetGroups = append(createdTargetGroups, group)

targetGroupAttributeInput := &elbv2.ModifyTargetGroupAttributesInput{TargetGroupArn: group.TargetGroupArn}

if lbSpec.LoadBalancerType == infrav1.LoadBalancerTypeNLB {
targetGroupAttributeInput.Attributes = append(targetGroupAttributeInput.Attributes,
elbv2types.TargetGroupAttribute{
Key: aws.String(infrav1.TargetGroupAttributeEnableConnectionTermination),
Value: aws.String("false"),
},
elbv2types.TargetGroupAttribute{
Key: aws.String(infrav1.TargetGroupAttributeUnhealthyDrainingIntervalSeconds),
Value: aws.String("300"),
},
)
}

if !lbSpec.PreserveClientIP {
targetGroupAttributeInput := &elbv2.ModifyTargetGroupAttributesInput{
TargetGroupArn: group.TargetGroupArn,
Attributes: []elbv2types.TargetGroupAttribute{
{
Key: aws.String(infrav1.TargetGroupAttributeEnablePreserveClientIP),
Value: aws.String("false"),
},
targetGroupAttributeInput.Attributes = append(targetGroupAttributeInput.Attributes,
elbv2types.TargetGroupAttribute{
Key: aws.String(infrav1.TargetGroupAttributeEnablePreserveClientIP),
Value: aws.String("false"),
},
}
)
}

if len(targetGroupAttributeInput.Attributes) > 0 {
s.scope.Debug("configuring target group attributes", "attributes", targetGroupAttributeInput)
if _, err := s.ELBV2Client.ModifyTargetGroupAttributes(ctx, targetGroupAttributeInput); err != nil {
return nil, nil, errors.Wrapf(err, "failed to modify target group attribute")
}
Expand Down
61 changes: 61 additions & 0 deletions pkg/cloud/services/elb/loadbalancer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1543,6 +1543,14 @@ func TestReconcileTargetGroupsAndListeners(t *testing.T) {
m.ModifyTargetGroupAttributes(gomock.Any(), gomock.Eq(&elbv2.ModifyTargetGroupAttributesInput{
TargetGroupArn: aws.String(tgArn),
Attributes: []elbv2types.TargetGroupAttribute{
{
Key: aws.String(infrav1.TargetGroupAttributeEnableConnectionTermination),
Value: aws.String("false"),
},
{
Key: aws.String(infrav1.TargetGroupAttributeUnhealthyDrainingIntervalSeconds),
Value: aws.String("300"),
},
{
Key: aws.String(infrav1.TargetGroupAttributeEnablePreserveClientIP),
Value: aws.String("false"),
Expand Down Expand Up @@ -1661,6 +1669,14 @@ func TestReconcileTargetGroupsAndListeners(t *testing.T) {
m.ModifyTargetGroupAttributes(gomock.Any(), &elbv2.ModifyTargetGroupAttributesInput{
TargetGroupArn: aws.String(tgArn),
Attributes: []elbv2types.TargetGroupAttribute{
{
Key: aws.String(infrav1.TargetGroupAttributeEnableConnectionTermination),
Value: aws.String("false"),
},
{
Key: aws.String(infrav1.TargetGroupAttributeUnhealthyDrainingIntervalSeconds),
Value: aws.String("300"),
},
{
Key: aws.String(infrav1.TargetGroupAttributeEnablePreserveClientIP),
Value: aws.String("false"),
Expand Down Expand Up @@ -1767,6 +1783,14 @@ func TestReconcileTargetGroupsAndListeners(t *testing.T) {
m.ModifyTargetGroupAttributes(gomock.Any(), &elbv2.ModifyTargetGroupAttributesInput{
TargetGroupArn: aws.String(tgArn),
Attributes: []elbv2types.TargetGroupAttribute{
{
Key: aws.String(infrav1.TargetGroupAttributeEnableConnectionTermination),
Value: aws.String("false"),
},
{
Key: aws.String(infrav1.TargetGroupAttributeUnhealthyDrainingIntervalSeconds),
Value: aws.String("300"),
},
{
Key: aws.String(infrav1.TargetGroupAttributeEnablePreserveClientIP),
Value: aws.String("false"),
Expand Down Expand Up @@ -1860,6 +1884,19 @@ func TestReconcileTargetGroupsAndListeners(t *testing.T) {
},
},
}, nil)
m.ModifyTargetGroupAttributes(gomock.Any(), gomock.Eq(&elbv2.ModifyTargetGroupAttributesInput{
TargetGroupArn: aws.String(tgArn),
Attributes: []elbv2types.TargetGroupAttribute{
{
Key: aws.String(infrav1.TargetGroupAttributeEnableConnectionTermination),
Value: aws.String("false"),
},
{
Key: aws.String(infrav1.TargetGroupAttributeUnhealthyDrainingIntervalSeconds),
Value: aws.String("300"),
},
},
})).Return(nil, nil)
m.DescribeListeners(gomock.Any(), &elbv2.DescribeListenersInput{
LoadBalancerArn: aws.String(elbArn),
}).Return(&elbv2.DescribeListenersOutput{
Expand Down Expand Up @@ -2000,6 +2037,14 @@ func TestReconcileTargetGroupsAndListeners(t *testing.T) {
m.ModifyTargetGroupAttributes(gomock.Any(), &elbv2.ModifyTargetGroupAttributesInput{
TargetGroupArn: aws.String(tgArn),
Attributes: []elbv2types.TargetGroupAttribute{
{
Key: aws.String(infrav1.TargetGroupAttributeEnableConnectionTermination),
Value: aws.String("false"),
},
{
Key: aws.String(infrav1.TargetGroupAttributeUnhealthyDrainingIntervalSeconds),
Value: aws.String("300"),
},
{
Key: aws.String(infrav1.TargetGroupAttributeEnablePreserveClientIP),
Value: aws.String("false"),
Expand Down Expand Up @@ -2115,6 +2160,14 @@ func TestReconcileTargetGroupsAndListeners(t *testing.T) {
m.ModifyTargetGroupAttributes(gomock.Any(), &elbv2.ModifyTargetGroupAttributesInput{
TargetGroupArn: aws.String(tgArn),
Attributes: []elbv2types.TargetGroupAttribute{
{
Key: aws.String(infrav1.TargetGroupAttributeEnableConnectionTermination),
Value: aws.String("false"),
},
{
Key: aws.String(infrav1.TargetGroupAttributeUnhealthyDrainingIntervalSeconds),
Value: aws.String("300"),
},
{
Key: aws.String(infrav1.TargetGroupAttributeEnablePreserveClientIP),
Value: aws.String("false"),
Expand Down Expand Up @@ -2403,6 +2456,14 @@ func TestReconcileV2LB(t *testing.T) {
m.ModifyTargetGroupAttributes(gomock.Any(), gomock.Eq(&elbv2.ModifyTargetGroupAttributesInput{
TargetGroupArn: aws.String(tgArn),
Attributes: []elbv2types.TargetGroupAttribute{
{
Key: aws.String(infrav1.TargetGroupAttributeEnableConnectionTermination),
Value: aws.String("false"),
},
{
Key: aws.String(infrav1.TargetGroupAttributeUnhealthyDrainingIntervalSeconds),
Value: aws.String("300"),
},
{
Key: aws.String(infrav1.TargetGroupAttributeEnablePreserveClientIP),
Value: aws.String("false"),
Expand Down