Skip to content

OCPSTRAT-886: Support dual-stack LB in service disruption monitor #30936

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
openshift-merge-bot merged 1 commit into from
Mar 31, 2026
+19 −0
Merged

OCPSTRAT-886: Support dual-stack LB in service disruption monitor #30936

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
19 changes: 19 additions & 0 deletions pkg/monitortests/network/disruptionserviceloadbalancer/monitortest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,25 @@ func (w *availability) PrepareCollection(ctx context.Context, adminRESTConfig *r
// - Azure is hardcoded to 15s (2 failed with 5s interval in 1.17) and is sufficient
// - GCP has a non-configurable interval of 32s (3 failed health checks with 8s interval in 1.17)
// - thus pods need to stay up for > 32s, so pod shutdown period will will be 45s

// Configure dual-stack if the cluster created with dual-stack IP families.
// NLB is required on AWS for dual-stack load balancers.
if infra.Status.PlatformStatus.AWS != nil {
var dualStackIPFamilies []corev1.IPFamily
switch infra.Status.PlatformStatus.AWS.IPFamily {
case configv1.DualStackIPv4Primary:
dualStackIPFamilies = []corev1.IPFamily{corev1.IPv4Protocol, corev1.IPv6Protocol}
case configv1.DualStackIPv6Primary:
dualStackIPFamilies = []corev1.IPFamily{corev1.IPv6Protocol, corev1.IPv4Protocol}
}

if len(dualStackIPFamilies) > 0 {
s.Annotations["service.beta.kubernetes.io/aws-load-balancer-type"] = "nlb"
dualStackPolicy := corev1.IPFamilyPolicyRequireDualStack
s.Spec.IPFamilyPolicy = &dualStackPolicy
s.Spec.IPFamilies = dualStackIPFamilies
}
}
})
if err != nil {
return fmt.Errorf("error creating tcp service: %w", err)
Expand Down