Skip to content

[release-5.0] OCPBUGS-111969: router/metrics: enable proxy protocol for client on AWS clusters #31533

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
Aug 21, 2026
+1 −13
Merged

[release-5.0] OCPBUGS-111969: router/metrics: enable proxy protocol for client on AWS clusters #31533

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
14 changes: 1 addition & 13 deletions test/extended/router/metrics.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,7 @@ var _ = g.Describe("[sig-network][Feature:Router]", func() {
infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
platformType := infra.Status.Platform
dualStackIPFamily := false
if infra.Status.PlatformStatus != nil {
platformType = infra.Status.PlatformStatus.Type
if infra.Status.PlatformStatus.AWS != nil {
ipFamily := infra.Status.PlatformStatus.AWS.IPFamily
if ipFamily == configv1.DualStackIPv4Primary || ipFamily == configv1.DualStackIPv6Primary {
dualStackIPFamily = true
}
}
}
// Dual-stack installations on AWS are forced to use NLB type, which
// doesn't accept proxy protocol (yet).
proxyProtocol = (platformType == configv1.AWSPlatformType) && !dualStackIPFamily
proxyProtocol = platformType == configv1.AWSPlatformType

// This test needs to make assertions against a single router pod, so all access
// to the router should happen through a single endpoint.
Expand Down