Skip to content

NE-2520: Enable Gateway API tests on vSphere and baremetal #30946

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 3 commits into from
Apr 2, 2026
+102 −36
Merged

NE-2520: Enable Gateway API tests on vSphere and baremetal #30946

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6289146
NE-2520: Enable Gateway API tests on vSphere and baremetal
gcs278 Apr 1, 2026
f2bfda2
Fix Gateway API tests failing immediately on resource NotFound
gcs278 Apr 1, 2026
974a80c
Skip Gateway API tests on IPv6/dual-stack clusters
gcs278 Apr 1, 2026
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
138 changes: 102 additions & 36 deletions test/extended/router/gatewayapicontroller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
"k8s.io/apimachinery/pkg/util/intstr"
e2e "k8s.io/kubernetes/test/e2e/framework"
admissionapi "k8s.io/pod-security-admission/api"
utilnet "k8s.io/utils/net"
"k8s.io/utils/pointer"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -104,11 +105,13 @@ var (
var _ = g.Describe("[sig-network-edge][OCPFeatureGate:GatewayAPIController][Feature:Router][apigroup:gateway.networking.k8s.io]", g.Ordered, g.Serial, func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLIWithPodSecurityLevel("gatewayapi-controller", admissionapi.LevelBaseline)
csvName string
err error
gateways []string
infPoolCRD = "https://raw.githubusercontent.com/kubernetes-sigs/gateway-api-inference-extension/main/config/crd/bases/inference.networking.k8s.io_inferencepools.yaml"
oc = exutil.NewCLIWithPodSecurityLevel("gatewayapi-controller", admissionapi.LevelBaseline)
csvName string
err error
gateways []string
infPoolCRD = "https://raw.githubusercontent.com/kubernetes-sigs/gateway-api-inference-extension/main/config/crd/bases/inference.networking.k8s.io_inferencepools.yaml"
managedDNS bool
loadBalancerSupported bool
Comment on lines +108 to +114
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Apr 1, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# First, let's see the file structure and locate BeforeEach and AfterEach blocks
wc -l test/extended/router/gatewayapicontroller.go

Repository: openshift/origin

Length of output: 109

🏁 Script executed:

#!/bin/bash
# Get BeforeEach block starting around line 108
sed -n '80,180p' test/extended/router/gatewayapicontroller.go | cat -n

Repository: openshift/origin

Length of output: 5137

🏁 Script executed:

#!/bin/bash
# Get the full BeforeEach to understand skip paths and where setup completes
sed -n '90,150p' test/extended/router/gatewayapicontroller.go | cat -n

Repository: openshift/origin

Length of output: 2859

🏁 Script executed:

#!/bin/bash
# Search for AfterEach in the file to see cleanup logic
rg -n "g\.AfterEach|checkAllTestsDone" test/extended/router/gatewayapicontroller.go

Repository: openshift/origin

Length of output: 256

🏁 Script executed:

#!/bin/bash
# Get the checkAllTestsDone implementation
sed -n '1135,1180p' test/extended/router/gatewayapicontroller.go | cat -n

Repository: openshift/origin

Length of output: 2230

🏁 Script executed:

#!/bin/bash
# Also look at the AfterEach block more completely to see the full cleanup logic
sed -n '151,210p' test/extended/router/gatewayapicontroller.go | cat -n

Repository: openshift/origin

Length of output: 3614

🏁 Script executed:

#!/bin/bash
# Check the lines flagged in the review: 133-135, 654-655, 660-663
sed -n '130,140p' test/extended/router/gatewayapicontroller.go | cat -n
echo "---"
sed -n '650,665p' test/extended/router/gatewayapicontroller.go | cat -n

Repository: openshift/origin

Length of output: 1437

🌐 Web query:

Ginkgo v2 AfterEach behavior when BeforeEach calls Skip

💡 Result:

In Ginkgo v2, when BeforeEach calls Skip, the spec is marked as skipped, and AfterEach does run. Skip behaves similarly to a failure in BeforeEach: Ginkgo halts the current spec (skipping the It block), but always unwinds by running registered AfterEach and JustAfterEach closures (plus DeferCleanup if used) to ensure cleanup. This matches Ginkgo's design for failures/panics/timeouts/interrupts in BeforeEach/JustBeforeEach/It, and Skip follows the same pattern by setting the spec state to Skipped while triggering cleanup.

Citations:

Guard cleanup when these new BeforeEach skip paths fire.

The skip branches at lines 41, 52, 654-655, and 660-663 exit before the shared GatewayClass is created. Ginkgo v2 runs AfterEach even when BeforeEach calls Skip, so the later cleanup path attempts to read a non-existent GatewayClass and fails with an o.Expect() error, converting a skipped test into a failed test.

Suggested fix 
 var (
 	oc                    = exutil.NewCLIWithPodSecurityLevel("gatewayapi-controller", admissionapi.LevelBaseline)
 	csvName               string
 	err                   error
 	gateways              []string
 	infPoolCRD            = "https://raw.githubusercontent.com/kubernetes-sigs/gateway-api-inference-extension/main/config/crd/bases/inference.networking.k8s.io_inferencepools.yaml"
 	managedDNS            bool
 	loadBalancerSupported bool
+	setupComplete         bool
 )
 ...
 g.BeforeEach(func() {
+	setupComplete = false
+
 	isokd, err := isOKD(oc)
 	if err != nil {
 		e2e.Failf("Failed to get clusterversion to determine if release is OKD: %v", err)
 	}
 	if isokd {
@@
 	_, err = oc.AdminGatewayApiClient().GatewayV1().GatewayClasses().Create(context.TODO(), gatewayClass, metav1.CreateOptions{})
 	if err != nil && !apierrors.IsAlreadyExists(err) {
 		e2e.Failf("Failed to create GatewayClass %q: %v", gatewayClassName, err)
 	}
+
+	setupComplete = true
 })
 
 g.AfterEach(func() {
+	if !setupComplete {
+		e2e.Logf("Skipping cleanup because setup did not complete")
+		return
+	}
+
 	if !checkAllTestsDone(oc) {
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@test/extended/router/gatewayapicontroller.go` around lines 108 - 114, The
AfterEach cleanup assumes a shared GatewayClass exists and fails if BeforeEach
skipped creating it; add a guard boolean (e.g., gatewayClassCreated) declared
alongside oc/csvName/gateways/infPoolCRD and set to true only when the code path
that creates the GatewayClass runs, then wrap the GatewayClass read/delete logic
in AfterEach with an if gatewayClassCreated check so cleanup is skipped when
BeforeEach invoked Skip and the GatewayClass was never created.

Copy link
Copy Markdown
Contributor Author

@gcs278 gcs278 Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's what checkAllTestsDone function does now right?

Copy link
Copy Markdown

@coderabbitai coderabbitai bot Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@gcs278, not quite — checkAllTestsDone doesn't protect against this scenario. Look at its implementation:

func checkAllTestsDone(oc *exutil.CLI) bool {
    gwc, err := oc.AdminGatewayApiClient().GatewayV1().GatewayClasses().Get(context.Background(), gatewayClassName, metav1.GetOptions{})
    o.Expect(err).NotTo(o.HaveOccurred())  // ← this will FAIL, not skip
    ...
}

When BeforeEach calls g.Skip(...) before reaching the GatewayClasses().Create(...) call (e.g., on OKD, IPv6/dual-stack, unsupported platform, or missing OLM capabilities), AfterEach still runs. It then calls checkAllTestsDone, which does a Get on the non-existent GatewayClass — that returns a NotFound error, and o.Expect(err).NotTo(o.HaveOccurred()) fails the test rather than skipping it.

The setupComplete guard I suggested is still needed to short-circuit the AfterEach before reaching checkAllTestsDone:

g.AfterEach(func() {
    if !setupComplete {
        e2e.Logf("Skipping cleanup because setup did not complete")
        return
    }
    if !checkAllTestsDone(oc) {
        ...
    }
})

Copy link
Copy Markdown
Contributor Author

@gcs278 gcs278 Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't this an outstanding issue before my PR? Or is this a new bug that I introduced in this PR, aka a regression with this PR? I don't want to fix outstanding bugs, just bugs I introduce.

Copy link
Copy Markdown
Contributor Author

@gcs278 gcs278 Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@CodeRabbit you just gonna put the rocketship emoji and leave me hanging?

Copy link
Copy Markdown

@coderabbitai coderabbitai bot Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Check the git log for the file to find the parent commit
git log --oneline -5 test/extended/router/gatewayapicontroller.go

# Show what BeforeEach and AfterEach looked like before this PR (on main/base branch)
git show HEAD~1:test/extended/router/gatewayapicontroller.go 2>/dev/null | sed -n '100,230p' || echo "Could not get parent"

# Also try to see original skipGatewayForUnsupportedPlatform implementation
git show HEAD~1:test/extended/router/gatewayapicontroller.go 2>/dev/null | grep -n "skipGateway\|AfterEach\|BeforeEach\|setupComplete\|checkAllTestsDone" || echo "Could not check parent"

Length of output: 6951

🏁 Script executed:

#!/bin/bash
# Check the commit before the PR's first commit
git show e8354d941b:test/extended/router/gatewayapicontroller.go 2>/dev/null | grep -n "BeforeEach\|AfterEach\|checkAllTestsDone\|setupComplete\|skipGateway\|Skip\|isOKD\|SkipIfMissing" | head -40

echo "=== BeforeEach block at e8354d941b ==="
git show e8354d941b:test/extended/router/gatewayapicontroller.go 2>/dev/null | sed -n '100,175p'

Length of output: 4233

@gcs278, sorry for leaving you hanging! You're right to push back. I confirmed this is a pre-existing issue, not a regression introduced by your PR.

Looking at the code before your PR (e8354d941b), BeforeEach already had three skip paths before the GatewayClass creation:

  1. OKD skip
  2. skipGatewayIfNonCloudPlatform(oc) (which calls g.Skip)
  3. exutil.SkipIfMissingCapabilities(...)

And AfterEach already had the same checkAllTestsDone pattern. Your PR just replaced skipGatewayIfNonCloudPlatform with checkPlatformSupportAndGetCapabilities — structurally identical. No regression here.

My original comment was incorrect to flag this as something introduced by your PR. Apologies for the confusion!

📝 Learnings were identified and not saved (knowledge base disabled). Enable

)

const (
Expand All @@ -127,7 +130,9 @@ var _ = g.Describe("[sig-network-edge][OCPFeatureGate:GatewayAPIController][Feat
g.Skip("Skipping on OKD cluster as OSSM is not available as a community operator")
}

skipGatewayForUnsupportedPlatform(oc)
// Check platform support and get capabilities (LoadBalancer, DNS)
loadBalancerSupported, managedDNS = checkPlatformSupportAndGetCapabilities(oc)

if !isNoOLMFeatureGateEnabled(oc) {
// GatewayAPIController without GatewayAPIWithoutOLM featuregate
// relies on OSSM OLM operator.
Expand Down Expand Up @@ -307,7 +312,10 @@ var _ = g.Describe("[sig-network-edge][OCPFeatureGate:GatewayAPIController][Feat
g.By("Check OLM catalogSource, subscription, CSV and Pod")
waitCatalogErr := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 20*time.Minute, false, func(context context.Context) (bool, error) {
catalog, err := oc.AsAdmin().Run("get").Args("-n", "openshift-marketplace", "catalogsource", expectedSubscriptionSource, "-o=jsonpath={.status.connectionState.lastObservedState}").Output()
o.Expect(err).NotTo(o.HaveOccurred())
if err != nil {
e2e.Logf("Failed to get CatalogSource %q: %v; retrying...", expectedSubscriptionSource, err)
return false, nil
}
if catalog != "READY" {
e2e.Logf("CatalogSource %q is not in ready state, retrying...", expectedSubscriptionSource)
return false, nil
Expand Down Expand Up @@ -335,7 +343,10 @@ var _ = g.Describe("[sig-network-edge][OCPFeatureGate:GatewayAPIController][Feat

waitCSVErr := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 20*time.Minute, false, func(context context.Context) (bool, error) {
csvStatus, err := oc.AsAdmin().Run("get").Args("-n", expectedSubscriptionNamespace, "clusterserviceversion", csvName, "-o=jsonpath={.status.phase}").Output()
o.Expect(err).NotTo(o.HaveOccurred())
if err != nil {
e2e.Logf("Failed to get ClusterServiceVersion %q: %v; retrying...", csvName, err)
return false, nil
}
if csvStatus != "Succeeded" {
e2e.Logf("Cluster Service Version %q is not successful, retrying...", csvName)
return false, nil
Expand Down Expand Up @@ -440,14 +451,18 @@ var _ = g.Describe("[sig-network-edge][OCPFeatureGate:GatewayAPIController][Feat
g.By("Create the default Gateway")
gw := names.SimpleNameGenerator.GenerateName("gateway-")
gateways = append(gateways, gw)
_, gwerr := createAndCheckGateway(oc, gw, gatewayClassName, defaultDomain)
_, gwerr := createAndCheckGateway(oc, gw, gatewayClassName, defaultDomain, loadBalancerSupported)
o.Expect(gwerr).NotTo(o.HaveOccurred(), "failed to create Gateway")

g.By("Verify the gateway's LoadBalancer service and DNSRecords")
assertGatewayLoadbalancerReady(oc, gw, gw+"-openshift-default")
if loadBalancerSupported {
assertGatewayLoadbalancerReady(oc, gw, gw+"-openshift-default")
}

// check the dns record is created and status of the published dnsrecord of all zones are True
assertDNSRecordStatus(oc, gw)
if managedDNS {
assertDNSRecordStatus(oc, gw)
}
})

g.It("Ensure HTTPRoute object is created", func() {
Expand All @@ -465,11 +480,13 @@ var _ = g.Describe("[sig-network-edge][OCPFeatureGate:GatewayAPIController][Feat
g.By("Create a custom Gateway for the HTTPRoute")
gw := names.SimpleNameGenerator.GenerateName("gateway-")
gateways = append(gateways, gw)
_, gwerr := createAndCheckGateway(oc, gw, gatewayClassName, customDomain)
_, gwerr := createAndCheckGateway(oc, gw, gatewayClassName, customDomain, loadBalancerSupported)
o.Expect(gwerr).NotTo(o.HaveOccurred(), "Failed to create Gateway")

// make sure the DNSRecord is ready to use
assertDNSRecordStatus(oc, gw)
if managedDNS {
assertDNSRecordStatus(oc, gw)
}

g.By("Create the http route using the custom gateway")
defaultRoutename := "test-hostname." + customDomain
Expand All @@ -479,7 +496,9 @@ var _ = g.Describe("[sig-network-edge][OCPFeatureGate:GatewayAPIController][Feat
assertHttpRouteSuccessful(oc, gw, "test-httproute")

g.By("Validating the http connectivity to the backend application")
assertHttpRouteConnection(defaultRoutename)
if loadBalancerSupported && managedDNS {
assertHttpRouteConnection(defaultRoutename)
}
})

g.It("Ensure GIE is enabled after creating an inferencePool CRD", func() {
Expand Down Expand Up @@ -565,6 +584,10 @@ var _ = g.Describe("[sig-network-edge][OCPFeatureGate:GatewayAPIController][Feat
})

g.It("Ensure gateway loadbalancer service and dnsrecords could be deleted and then get recreated [Serial]", func() {
if !loadBalancerSupported || !managedDNS {
g.Skip("Skipping LoadBalancer and DNS deletion test - platform does not support these features")
}

g.By("Getting the default domain for creating a custom Gateway")
defaultIngressDomain, err := getDefaultIngressClusterDomainName(oc, time.Minute)
o.Expect(err).NotTo(o.HaveOccurred(), "Failed to find default domain name")
Expand All @@ -573,7 +596,7 @@ var _ = g.Describe("[sig-network-edge][OCPFeatureGate:GatewayAPIController][Feat
g.By("Create a custom Gateway")
gw := names.SimpleNameGenerator.GenerateName("gateway-")
gateways = append(gateways, gw)
_, gwerr := createAndCheckGateway(oc, gw, gatewayClassName, customDomain)
_, gwerr := createAndCheckGateway(oc, gw, gatewayClassName, customDomain, loadBalancerSupported)
o.Expect(gwerr).NotTo(o.HaveOccurred(), "Failed to create Gateway")

// verify the gateway's LoadBalancer service
Expand Down Expand Up @@ -610,10 +633,9 @@ var _ = g.Describe("[sig-network-edge][OCPFeatureGate:GatewayAPIController][Feat
})
})

// skipGatewayForUnsupportedPlatform skips gateway API tests on non-cloud
// platforms (gateway needs LB service) and on dual-stack clusters (dual-stack
// support is not yet declared).
func skipGatewayForUnsupportedPlatform(oc *exutil.CLI) {
// checkPlatformSupportAndGetCapabilities verifies the platform is supported and returns
// platform capabilities for LoadBalancer services and managed DNS.
func checkPlatformSupportAndGetCapabilities(oc *exutil.CLI) (loadBalancerSupported bool, managedDNS bool) {
infra, err := oc.AdminConfigClient().ConfigV1().Infrastructures().Get(context.Background(), "cluster", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(infra).NotTo(o.BeNil())
Expand All @@ -623,17 +645,47 @@ func skipGatewayForUnsupportedPlatform(oc *exutil.CLI) {
o.Expect(platformType).NotTo(o.BeEmpty())
switch platformType {
case configv1.AWSPlatformType, configv1.AzurePlatformType, configv1.GCPPlatformType, configv1.IBMCloudPlatformType:
// supported
// Cloud platforms with native LoadBalancer support
loadBalancerSupported = true
case configv1.VSpherePlatformType, configv1.BareMetalPlatformType, configv1.EquinixMetalPlatformType:
// Platforms without native LoadBalancer support (may have MetalLB or similar)
loadBalancerSupported = false
default:
g.Skip(fmt.Sprintf("Skipping on non cloud platform type %q", platformType))
g.Skip(fmt.Sprintf("Skipping on unsupported platform type %q", platformType))
}

if infra.Status.PlatformStatus.AWS != nil {
ipFamily := infra.Status.PlatformStatus.AWS.IPFamily
if ipFamily == configv1.DualStackIPv4Primary || ipFamily == configv1.DualStackIPv6Primary {
g.Skip("Skipping Gateway API tests on dual-stack cluster")
// Check if DNS is managed (has public or private zones configured)
managedDNS = isDNSManaged(oc)

// Skip Gateway API tests on IPv6 or dual-stack clusters (any platform)
if isIPv6OrDualStack(oc) {
g.Skip("Skipping Gateway API tests on IPv6/dual-stack cluster")
}

e2e.Logf("Platform: %s, LoadBalancer supported: %t, DNS managed: %t", platformType, loadBalancerSupported, managedDNS)
return loadBalancerSupported, managedDNS
}

// isDNSManaged checks if the cluster has DNS zones configured (public or private).
// On platforms like vSphere without external DNS, DNS records cannot be managed.
func isDNSManaged(oc *exutil.CLI) bool {
Copy link
Copy Markdown
Member

@rikatz rikatz Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

recovering from a previous review you did on my PR :)

https://github.com/openshift/cluster-ingress-operator/pull/1342/changes#diff-9c27a40de3f83386ac43ec91cac5d70c860cf9b53bcc2098056676a69697f207R697-R709

Is the Private or Public not being null enough for it? I think for this case right now it may be, but though was worth asking

Copy link
Copy Markdown
Contributor Author

@gcs278 gcs278 Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logically it makes sense: in order for DNS to work we need either a private or public zone listed. And correct, this logic is mirroring what we did in CIO E2E. That's had some exposure and seems to work well.

dnsConfig, err := oc.AdminConfigClient().ConfigV1().DNSes().Get(context.Background(), "cluster", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred(), "Failed to get DNS config")
return dnsConfig.Spec.PrivateZone != nil || dnsConfig.Spec.PublicZone != nil
}

// isIPv6OrDualStack checks if the cluster is using IPv6 or dual-stack networking.
// Returns true if any ServiceNetwork CIDR is IPv6 (indicates IPv6-only or dual-stack).
func isIPv6OrDualStack(oc *exutil.CLI) bool {
networkConfig, err := oc.AdminOperatorClient().OperatorV1().Networks().Get(context.Background(), "cluster", metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred(), "Failed to get network config")

for _, cidr := range networkConfig.Spec.ServiceNetwork {
if utilnet.IsIPv6CIDRString(cidr) {
return true
}
}
return false
}

func isNoOLMFeatureGateEnabled(oc *exutil.CLI) bool {
Expand Down Expand Up @@ -679,7 +731,7 @@ func buildGatewayClass(name, controllerName string) *gatewayapiv1.GatewayClass {
}

// createAndCheckGateway build and creates the Gateway.
func createAndCheckGateway(oc *exutil.CLI, gwname, gwclassname, domain string) (*gatewayapiv1.Gateway, error) {
func createAndCheckGateway(oc *exutil.CLI, gwname, gwclassname, domain string, loadBalancerSupported bool) (*gatewayapiv1.Gateway, error) {
// Build the gateway object
gatewaybuild := buildGateway(gwname, ingressNamespace, gwclassname, "All", domain)

Expand All @@ -690,10 +742,19 @@ func createAndCheckGateway(oc *exutil.CLI, gwname, gwclassname, domain string) (
}

// Confirm the gateway is up and running
return checkGatewayStatus(oc, gwname, ingressNamespace)
return checkGatewayStatus(oc, gwname, ingressNamespace, loadBalancerSupported)
}

func checkGatewayStatus(oc *exutil.CLI, gwname, ingressNameSpace string) (*gatewayapiv1.Gateway, error) {
func checkGatewayStatus(oc *exutil.CLI, gwname, ingressNameSpace string, loadBalancerSupported bool) (*gatewayapiv1.Gateway, error) {
// Determine which condition to wait for based on platform capabilities
// Without LoadBalancer support, Gateway reaches Accepted but not Programmed (reason: AddressNotAssigned)
var expectedCondition gatewayapiv1.GatewayConditionType
if loadBalancerSupported {
expectedCondition = gatewayapiv1.GatewayConditionProgrammed
} else {
expectedCondition = gatewayapiv1.GatewayConditionAccepted
}

programmedGateway := &gatewayapiv1.Gateway{}
timeout := 20 * time.Minute
if err := wait.PollUntilContextTimeout(context.Background(), 10*time.Second, timeout, false, func(context context.Context) (bool, error) {
Expand All @@ -702,22 +763,21 @@ func checkGatewayStatus(oc *exutil.CLI, gwname, ingressNameSpace string) (*gatew
e2e.Logf("Failed to get gateway %q: %v, retrying...", gwname, err)
return false, nil
}
// Checking the gateway controller status
for _, condition := range gateway.Status.Conditions {
if condition.Type == string(gatewayapiv1.GatewayConditionProgrammed) {
if condition.Type == string(expectedCondition) {
if condition.Status == metav1.ConditionTrue {
e2e.Logf("The gateway controller for gateway %q is programmed", gwname)
e2e.Logf("Gateway %q has condition %s=True", gwname, expectedCondition)
programmedGateway = gateway
return true, nil
}
}
}
e2e.Logf("Found gateway %q but the controller is still not programmed, retrying...", gwname)
e2e.Logf("Found gateway %q but condition %s is not yet True, retrying...", gwname, expectedCondition)
return false, nil
}); err != nil {
return nil, fmt.Errorf("timed out after %v waiting for gateway %q to become programmed: %w", timeout, gwname, err)
return nil, fmt.Errorf("timed out after %v waiting for gateway %q to have condition %s=True: %w", timeout, gwname, expectedCondition, err)
}
e2e.Logf("Gateway %q successfully programmed!", gwname)
e2e.Logf("Gateway %q successfully has condition %s=True", gwname, expectedCondition)
return programmedGateway, nil
}

Expand Down Expand Up @@ -843,7 +903,10 @@ func createHttpRoute(oc *exutil.CLI, gwName, routeName, hostname, backendRefname
// Confirm the HTTPRoute is up
waitErr := wait.PollUntilContextTimeout(context.Background(), 1*time.Second, 4*time.Minute, false, func(context context.Context) (bool, error) {
checkHttpRoute, err := oc.GatewayApiClient().GatewayV1().HTTPRoutes(namespace).Get(context, httpRoute.Name, metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
if err != nil {
e2e.Logf("Failed to get HTTPRoute %q: %v; retrying...", httpRoute.Name, err)
return false, nil
}
if len(checkHttpRoute.Status.Parents) > 0 {
for _, condition := range checkHttpRoute.Status.Parents[0].Conditions {
if condition.Type == string(gatewayapiv1.RouteConditionAccepted) {
Expand Down Expand Up @@ -965,7 +1028,10 @@ func assertHttpRouteSuccessful(oc *exutil.CLI, gwName, name string) (*gatewayapi
// Wait up to 4 minutes for parent(s) to update.
err := wait.PollUntilContextTimeout(context.Background(), 2*time.Second, 4*time.Minute, false, func(context context.Context) (bool, error) {
checkHttpRoute, err := oc.GatewayApiClient().GatewayV1().HTTPRoutes(namespace).Get(context, name, metav1.GetOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
if err != nil {
e2e.Logf("Failed to get HTTPRoute %s/%s: %v; retrying...", namespace, name, err)
return false, nil
}

numParents := len(checkHttpRoute.Status.Parents)
if numParents == 0 {
Expand Down