Skip to content

[release-4.22] OCPBUGS-84322: Fix Gateway cleanup in parallel e2e test workers#31068

Open
openshift-cherrypick-robot wants to merge 3 commits intoopenshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-31023-to-release-4.22
Open

[release-4.22] OCPBUGS-84322: Fix Gateway cleanup in parallel e2e test workers#31068
openshift-cherrypick-robot wants to merge 3 commits intoopenshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-31023-to-release-4.22

Conversation

@openshift-cherrypick-robot
Copy link
Copy Markdown

This is an automated cherry-pick of #31023

/assign rhamini3

gcs278 and others added 3 commits April 24, 2026 15:17
The Gateway API controller tests tracked Gateways in a shared
in-memory gateways slice, deleting them during AfterEach cleanup.
However, openshift-tests distributes tests across separate parallel
worker processes. The annotation-based checkAllTestsDone coordination
works correctly because annotations are stored on the cluster-scoped
GatewayClass, but the gateways slice is not shared across processes.
The process that runs the final AfterEach cleanup has an empty
gateways slice, so it deletes the GatewayClass and istiod but never
deletes the Gateways created by other processes. This leaves gateway
deployments orphaned on the cluster.

As a secondary issue, even when gateways were deleted, the GatewayClass
and istiod were removed without waiting for the gateway proxy
deployments to be fully cleaned up by GC. Since the deployments have
an owner reference to the Gateway (not a finalizer), the cascade
deletion is asynchronous, creating a race where gateway pods lose
their control plane and crash-loop.

Fix both issues by cleaning up gateways at the individual test level
using defer deleteGateway, which deletes the Gateway and waits for
its proxy deployment to be removed by GC. Add deleteGateway and
waitForGatewayDeploymentDeletion helpers shared by both the controller
tests and the upgrade test Teardown. Cleanup errors now hard fail to
surface leftover resources immediately rather than causing confusing
downstream test failures.

https://redhat.atlassian.net/browse/OCPBUGS-83281

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-Authored-By: Grant Spence <gspence@redhat.com>
Co-Authored-By: Ishmam Amin <iamin@redhat.com>
@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented Apr 24, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 138dbb25-267f-4a61-af88-e992cbe4b887

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci-robot
Copy link
Copy Markdown

@openshift-cherrypick-robot: Jira Issue OCPBUGS-83281 has been cloned as Jira Issue OCPBUGS-84322. Will retitle bug to link to clone.
/retitle [release-4.22] OCPBUGS-84322: Fix Gateway cleanup in parallel e2e test workers

Details

In response to this:

This is an automated cherry-pick of #31023

/assign rhamini3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot changed the title [release-4.22] OCPBUGS-83281: Fix Gateway cleanup in parallel e2e test workers [release-4.22] OCPBUGS-84322: Fix Gateway cleanup in parallel e2e test workers Apr 24, 2026
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Apr 24, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-84322, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #31023

/assign rhamini3

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci Bot requested review from Miciah and alebedev87 April 24, 2026 15:20
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 24, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: openshift-cherrypick-robot
Once this PR has been reviewed and has the lgtm label, please assign miheer for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@gcs278
Copy link
Copy Markdown
Contributor

gcs278 commented Apr 24, 2026

pre-submits don't run automatically in 4.22 (may or may not be a bug with the pipeline controller). Here are the required jobs:
/test e2e-aws-csi
/test e2e-aws-jenkins
/test e2e-aws-ovn-fips
/test e2e-aws-ovn-image-registry
/test e2e-aws-ovn-microshift
/test e2e-aws-ovn-microshift-serial
/test e2e-aws-ovn-serial-1of2
/test e2e-aws-ovn-serial-2of2
/test e2e-gcp-csi
/test e2e-gcp-ovn
/test e2e-gcp-ovn-builds
/test e2e-gcp-ovn-image-ecosystem
/test e2e-gcp-ovn-upgrade
/test e2e-metal-ipi-ovn-ipv6
/test e2e-vsphere-ovn
/test e2e-vsphere-ovn-upi

@rhamini3
Copy link
Copy Markdown
Contributor

/test all

@rhamini3
Copy link
Copy Markdown
Contributor

/retest

@gcs278
Copy link
Copy Markdown
Contributor

gcs278 commented Apr 24, 2026

/jira refresh

@openshift-ci-robot
Copy link
Copy Markdown

@gcs278: This pull request references Jira Issue OCPBUGS-84322, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@rhamini3
Copy link
Copy Markdown
Contributor

/jira refresh

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Apr 24, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@rhamini3: This pull request references Jira Issue OCPBUGS-84322, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-83281 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-83281 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
  • bug has dependents

Requesting review from QA contact:
/cc @melvinjoseph86

Details

In response to this:

/jira refresh

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Apr 24, 2026
@openshift-ci openshift-ci Bot requested a review from melvinjoseph86 April 24, 2026 19:52
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Apr 24, 2026

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants