From 6e508d28297c15748e5c1d660ec650643bdb2e38 Mon Sep 17 00:00:00 2001 From: Thuan Vo Date: Mon, 17 Aug 2026 16:00:32 -0700 Subject: [PATCH] OCPBUGS-111704: router/metrics: enable proxy protocol for client on AWS clusters The cluster-ingress-operator now supports PROXY protocol for NLB by default (OCPBUGS-63219) on AWS. Thus, we need to partially revert NE-2422 to use proxy protocol for the client. This addresses the below failed e2e test in AWS dualstack periodic jobs: [sig-network][Feature:Router] The HAProxy router should expose prometheus metrics for a route [apigroup:route.openshift.io] [Suite:openshift/conformance/parallel] --- test/extended/router/metrics.go | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/test/extended/router/metrics.go b/test/extended/router/metrics.go index 61a47a705319..8895bc4b3648 100644 --- a/test/extended/router/metrics.go +++ b/test/extended/router/metrics.go @@ -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.