[release-4.17] OCPBUGS-81639: External gateway: Remove routes for external gateway pods in terminating or not ready state by arkadeepsen · Pull Request #3107 · openshift/ovn-kubernetes

arkadeepsen · 2026-04-02T11:49:36Z

Manual cherry pick of 3d32558 and d942a7d.

For 3d32558 resolved conflicts in:

go-controller/pkg/ovn/controller/apbroute/external_controller_pod.go
go-controller/pkg/ovn/egressgw.go
go-controller/pkg/ovn/ovn.go
go-controller/vendor/modules.txt

Then ran go mod tidy and go mod vendor

For d942a7d resolved conflicts in:

go-controller/pkg/ovn/controller/apbroute/external_controller_pod_test.go

Additionally, for d942a7d fixed issue of imported packages and package names in:

go-controller/pkg/ovn/controller/apbroute/external_controller_pod_test.go
go-controller/pkg/ovn/controller/apbroute/external_controller_namespace_test.go
go-controller/pkg/ovn/egressgw_test.go

Signed-off-by: arkadeepsen <arsen@redhat.com> (cherry picked from commit 3d32558)

coderabbitai · 2026-04-02T11:49:45Z

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: Pro

Run ID: 28927f2c-3dc2-4686-8436-5aeb51452e50

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

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

openshift-ci-robot · 2026-04-02T11:49:45Z

@arkadeepsen: This pull request references Jira Issue OCPBUGS-81639, 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.17.z) matches configured target version for branch (4.17.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-81329 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-81329 targets the "4.18.z" version, which is one of the valid target versions: 4.18.0, 4.18.z
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (togarcia@redhat.com), skipping review request.

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

Details

In response to this:

Manual cherry pick of 3d32558 and d942a7d.

For 3d32558 resolved conflicts in:

go-controller/pkg/ovn/controller/apbroute/external_controller_pod.go

go-controller/pkg/ovn/egressgw.go

go-controller/pkg/ovn/ovn.go

go-controller/vendor/modules.txt

For d942a7d resolved conflicts in:

go-controller/pkg/ovn/controller/apbroute/external_controller_pod_test.go

Additionally, for d942a7d fixed issue of imported packages and package names in:

go-controller/pkg/ovn/controller/apbroute/external_controller_pod_test.go

go-controller/pkg/ovn/controller/apbroute/external_controller_namespace_test.go

go-controller/pkg/ovn/egressgw_test.go

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.

arkadeepsen · 2026-04-02T12:29:02Z

/retest-required

arkadeepsen · 2026-04-02T14:30:09Z

/retest-required

arkadeepsen · 2026-04-02T15:24:28Z

/retest-required

arkadeepsen · 2026-04-02T17:40:56Z

/retest-required

arkadeepsen · 2026-04-03T02:12:33Z

/retest-required

tonyskapunk · 2026-04-06T17:25:09Z

/verify by tonyskapunk

tonyskapunk · 2026-04-06T17:31:25Z

/verified by tonyskapunk

openshift-ci-robot · 2026-04-06T17:31:37Z

@tonyskapunk: This PR has been marked as verified by tonyskapunk.

Details

In response to this:

/verified by tonyskapunk

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.

arkadeepsen · 2026-04-06T17:53:56Z

e2e-aws-ovn-windows is failing as the original fix was only backported till 4.18. I have asked in the PR to backport the fix till 4.17 as well.

arkadeepsen · 2026-04-13T07:08:12Z

openshift/windows-machine-config-operator#3935 merged

/test e2e-aws-ovn-windows

pperiyasamy · 2026-04-13T09:41:39Z

@arkadeepsen have you run go mod vendor with modules.txt changes ?

No. It came as part of the cherrypick.

Ran the go mod vendor and re-pushed again. Few lines got removed but did not impact the code that is being used.

Signed-off-by: arkadeepsen <arsen@redhat.com> (cherry picked from commit d942a7d)

openshift-ci-robot · 2026-04-13T11:41:34Z

@arkadeepsen: This pull request references Jira Issue OCPBUGS-81639, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.17.z) matches configured target version for branch (4.17.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-81329 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-81329 targets the "4.18.z" version, which is one of the valid target versions: 4.18.0, 4.18.z
bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira (togarcia@redhat.com), skipping review request.

Details

In response to this:

Manual cherry pick of 3d32558 and d942a7d.

For 3d32558 resolved conflicts in:

go-controller/pkg/ovn/controller/apbroute/external_controller_pod.go

go-controller/pkg/ovn/egressgw.go

go-controller/pkg/ovn/ovn.go

go-controller/vendor/modules.txt

Then ran go mod tidy and go mod vendor

For d942a7d resolved conflicts in:

go-controller/pkg/ovn/controller/apbroute/external_controller_pod_test.go

Additionally, for d942a7d fixed issue of imported packages and package names in:

go-controller/pkg/ovn/controller/apbroute/external_controller_pod_test.go

go-controller/pkg/ovn/controller/apbroute/external_controller_namespace_test.go

go-controller/pkg/ovn/egressgw_test.go

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.

arkadeepsen · 2026-04-13T11:42:48Z

Add the verified label again as the code change was only in the imported code via vendor directory and that's also not in the execution path.

/verified by @tonyskapunk

openshift-ci-robot · 2026-04-13T11:43:00Z

@arkadeepsen: This PR has been marked as verified by @tonyskapunk.

Details

In response to this:

Add the verified label again as the code change was only in the imported code via vendor directory and that's also not in the execution path.

/verified by @tonyskapunk

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.

arkadeepsen · 2026-04-13T12:38:11Z

/retest-required

arkadeepsen · 2026-04-13T13:35:07Z

/retest-required

arkadeepsen · 2026-04-13T17:14:15Z

/retest-required

openshift-ci · 2026-04-13T21:33:51Z

@arkadeepsen: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/security	`1fd26d3`	link	false	`/test security`

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.

pperiyasamy · 2026-04-14T07:22:23Z

/lgtm
/approve

openshift-ci · 2026-04-14T07:22:55Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: arkadeepsen, pperiyasamy

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [pperiyasamy]

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

pperiyasamy · 2026-04-14T07:23:00Z

/payload 4.17 ci blocking
/payload 4.17 nightly blocking

openshift-ci · 2026-04-14T07:23:06Z

@pperiyasamy: trigger 4 job(s) of type blocking for the ci release of OCP 4.17

periodic-ci-openshift-release-main-ci-4.17-upgrade-from-stable-4.16-e2e-aws-ovn-upgrade
periodic-ci-openshift-release-main-ci-4.17-upgrade-from-stable-4.16-e2e-azure-ovn-upgrade
periodic-ci-openshift-release-main-ci-4.17-e2e-gcp-ovn-upgrade
periodic-ci-openshift-hypershift-release-4.17-periodics-e2e-aws-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c52f7e80-37d2-11f1-8e5b-cd5c5daf8551-0

trigger 8 job(s) of type blocking for the nightly release of OCP 4.17

periodic-ci-openshift-release-main-nightly-4.17-e2e-aws-ovn-serial
periodic-ci-openshift-release-main-ci-4.17-e2e-aws-ovn-upgrade
periodic-ci-openshift-release-main-ci-4.17-e2e-aws-ovn-upgrade
periodic-ci-openshift-release-main-ci-4.17-e2e-azure-ovn-upgrade
periodic-ci-openshift-release-main-ci-4.17-upgrade-from-stable-4.16-e2e-gcp-ovn-rt-upgrade
periodic-ci-openshift-hypershift-release-4.17-periodics-e2e-aws-ovn-conformance
periodic-ci-openshift-release-main-nightly-4.17-e2e-metal-ipi-ovn-bm
periodic-ci-openshift-release-main-nightly-4.17-e2e-metal-ipi-ovn-ipv6

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/c52f7e80-37d2-11f1-8e5b-cd5c5daf8551-1

arkadeepsen · 2026-04-14T11:52:33Z

/payload-job periodic-ci-openshift-release-main-ci-4.17-e2e-aws-ovn-upgrade

openshift-ci · 2026-04-14T11:52:37Z

@arkadeepsen: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-main-ci-4.17-e2e-aws-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/6d25ffe0-37f8-11f1-9d07-3ab823bbb0f0-0

arkadeepsen · 2026-04-14T15:30:21Z

/payload-job periodic-ci-openshift-release-main-ci-4.17-e2e-aws-ovn-upgrade

openshift-ci · 2026-04-14T15:30:51Z

@arkadeepsen: trigger 1 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

periodic-ci-openshift-release-main-ci-4.17-e2e-aws-ovn-upgrade

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/da5ba0b0-3816-11f1-8df5-363d71c5a41a-0

arkadeepsen · 2026-04-15T07:02:03Z

@pperiyasamy all the payload jobs have passed now. Can you please add the backport-risk-assessed label?

pperiyasamy · 2026-04-15T08:12:46Z

/label backport-risk-assessed

openshift-ci-robot · 2026-04-15T08:17:57Z

@arkadeepsen: Jira Issue Verification Checks: Jira Issue OCPBUGS-81639
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-81639 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

Manual cherry pick of 3d32558 and d942a7d.

For 3d32558 resolved conflicts in:

go-controller/pkg/ovn/controller/apbroute/external_controller_pod.go

go-controller/pkg/ovn/egressgw.go

go-controller/pkg/ovn/ovn.go

go-controller/vendor/modules.txt

Then ran go mod tidy and go mod vendor

For d942a7d resolved conflicts in:

go-controller/pkg/ovn/controller/apbroute/external_controller_pod_test.go

Additionally, for d942a7d fixed issue of imported packages and package names in:

go-controller/pkg/ovn/controller/apbroute/external_controller_pod_test.go

go-controller/pkg/ovn/controller/apbroute/external_controller_namespace_test.go

go-controller/pkg/ovn/egressgw_test.go

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.

arkadeepsen · 2026-04-15T09:21:33Z

/jira backport release-4.16,release-4.15,release-4.14

arkadeepsen · 2026-04-15T10:00:56Z

/cherrypick release-4.16 release-4.15 release-4.14

openshift-cherrypick-robot · 2026-04-15T10:02:23Z

@arkadeepsen: #3107 failed to apply on top of branch "release-4.16":

Applying: Remove routes of ex gw pods in terminating or not ready state
Using index info to reconstruct a base tree...
M	go-controller/pkg/ovn/egressgw.go
M	go-controller/pkg/ovn/ovn.go
M	go-controller/vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging go-controller/vendor/modules.txt
CONFLICT (content): Merge conflict in go-controller/vendor/modules.txt
Auto-merging go-controller/pkg/ovn/ovn.go
Auto-merging go-controller/pkg/ovn/egressgw.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Remove routes of ex gw pods in terminating or not ready state

Details

In response to this:

/cherrypick release-4.16 release-4.15 release-4.14

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.

openshift-merge-robot · 2026-04-17T23:10:20Z

Fix included in release 4.17.0-0.nightly-2026-04-17-173830

Remove routes of ex gw pods in terminating or not ready state

4c19247

Signed-off-by: arkadeepsen <arsen@redhat.com> (cherry picked from commit 3d32558)

openshift-ci Bot requested review from jcaamano and ricky-rav April 2, 2026 11:50

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Apr 6, 2026

arkadeepsen mentioned this pull request Apr 6, 2026

[release-4.18] Do not fail metadata endpoint check in AWS openshift/windows-machine-config-operator#3651

Merged

pperiyasamy reviewed Apr 13, 2026

View reviewed changes

Add unit tests for ex gw pods in terminating or not ready state

1fd26d3

Signed-off-by: arkadeepsen <arsen@redhat.com> (cherry picked from commit d942a7d)

arkadeepsen force-pushed the ex-gw-fix-4.17 branch from 8a3c834 to 1fd26d3 Compare April 13, 2026 11:39

openshift-ci-robot removed the verified Signifies that the PR passed pre-merge verification criteria label Apr 13, 2026

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Apr 13, 2026

openshift-ci Bot assigned pperiyasamy Apr 14, 2026

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Apr 14, 2026

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 14, 2026

openshift-ci Bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Apr 15, 2026

openshift-ci Bot assigned anuragthehatter, asood-rh, barbora137, jechen0648, mffiedler, rbbratta and weliang1 Apr 15, 2026

openshift-merge-bot Bot merged commit 3f208c0 into openshift:release-4.17 Apr 15, 2026
26 of 27 checks passed

arkadeepsen deleted the ex-gw-fix-4.17 branch April 15, 2026 08:44

Conversation

arkadeepsen commented Apr 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai Bot commented Apr 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

openshift-ci-robot commented Apr 2, 2026

Uh oh!

arkadeepsen commented Apr 2, 2026

Uh oh!

arkadeepsen commented Apr 2, 2026

Uh oh!

arkadeepsen commented Apr 2, 2026

Uh oh!

arkadeepsen commented Apr 2, 2026

Uh oh!

arkadeepsen commented Apr 3, 2026

Uh oh!

tonyskapunk commented Apr 6, 2026

Uh oh!

tonyskapunk commented Apr 6, 2026

Uh oh!

openshift-ci-robot commented Apr 6, 2026

Uh oh!

arkadeepsen commented Apr 6, 2026

Uh oh!

arkadeepsen commented Apr 13, 2026

Uh oh!

pperiyasamy Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

arkadeepsen Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

arkadeepsen Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

openshift-ci-robot commented Apr 13, 2026

Uh oh!

arkadeepsen commented Apr 13, 2026

Uh oh!

openshift-ci-robot commented Apr 13, 2026

Uh oh!

arkadeepsen commented Apr 13, 2026

Uh oh!

arkadeepsen commented Apr 13, 2026

Uh oh!

arkadeepsen commented Apr 13, 2026

Uh oh!

openshift-ci Bot commented Apr 13, 2026

Uh oh!

pperiyasamy commented Apr 14, 2026

Uh oh!

openshift-ci Bot commented Apr 14, 2026

Uh oh!

pperiyasamy commented Apr 14, 2026

Uh oh!

openshift-ci Bot commented Apr 14, 2026

Uh oh!

arkadeepsen commented Apr 14, 2026

Uh oh!

openshift-ci Bot commented Apr 14, 2026

Uh oh!

arkadeepsen commented Apr 14, 2026

Uh oh!

openshift-ci Bot commented Apr 14, 2026

Uh oh!

arkadeepsen commented Apr 15, 2026

Uh oh!

pperiyasamy commented Apr 15, 2026

Uh oh!

Uh oh!

openshift-ci-robot commented Apr 15, 2026

Uh oh!

arkadeepsen commented Apr 15, 2026

Uh oh!

arkadeepsen commented Apr 15, 2026

Uh oh!

arkadeepsen commented Apr 2, 2026 •

edited

Loading

coderabbitai Bot commented Apr 2, 2026 •

edited

Loading