OCPBUGS-65618: [release-4.20] OCP4: 4.18.22 EgressIP Failover does not succeed - extended downtime and no reassignment between egress-capable peers

[cgoncalves]

• Upstream PR: Fix GARP sending 0.0.0.0 due to incorrect IPv4 byte extraction ovn-kubernetes/ovn-kubernetes#5654
• Downstream PR: OCPBUGS-61285,OCPBUGS-57053: DownStream Merge [11-13-2025] #2859

Conflict in go-controller/pkg/kubevirt/pod.go coming from 3e07236

$ git cherry-pick -x cc15dc1c0b87dcd98e2c8eb48fe06080aede552a 
Auto-merging go-controller/pkg/kubevirt/pod.go
CONFLICT (content): Merge conflict in go-controller/pkg/kubevirt/pod.go
Auto-merging test/e2e/egressip.go
Auto-merging test/e2e/util.go
error: could not apply cc15dc1c0... Fix GARP sending 0.0.0.0 due to incorrect IPv4 byte extraction
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

$ git diff
diff --cc go-controller/pkg/kubevirt/pod.go
index 8cde9d713,3e423744f..000000000
--- a/go-controller/pkg/kubevirt/pod.go
+++ b/go-controller/pkg/kubevirt/pod.go
@@@ -532,7 -547,13 +532,17 @@@ func (r *DefaultGatewayReconciler) Reco
                if gwIP == nil {
                        continue
                }
++<<<<<<< HEAD
 +              garp := util.GARP{IP: gwIP, MAC: &lrpMAC}
++=======
+               if config.Layer2UsesTransitRouter {
+                       gwMAC = util.IPAddrToHWAddr(gwIP)
+               }
+               garp, err := util.NewGARP(gwIP, &gwMAC)
+               if err != nil {
+                       return fmt.Errorf("failed to create GARP for gateway IP %s: %w", gwIP, err)
+               }
++>>>>>>> cc15dc1c0 (Fix GARP sending 0.0.0.0 due to incorrect IPv4 byte extraction)
                if err := util.BroadcastGARP(r.interfaceName, garp); err != nil {
                        return err
                }

[openshift-ci-robot]

@cgoncalves: This pull request references Jira Issue OCPBUGS-65618, which is invalid:

• expected dependent Jira Issue OCPBUGS-61285 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

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.

In response to this:

• Upstream PR: Fix GARP sending 0.0.0.0 due to incorrect IPv4 byte extraction ovn-kubernetes/ovn-kubernetes#5654
• Downstream PR: OCPBUGS-61285,OCPBUGS-57053: DownStream Merge [11-13-2025] #2859

Conflict in go-controller/pkg/kubevirt/pod.go coming from 3e07236

$ git cherry-pick -x cc15dc1c0b87dcd98e2c8eb48fe06080aede552a 
Auto-merging go-controller/pkg/kubevirt/pod.go
CONFLICT (content): Merge conflict in go-controller/pkg/kubevirt/pod.go
Auto-merging test/e2e/egressip.go
Auto-merging test/e2e/util.go
error: could not apply cc15dc1c0... Fix GARP sending 0.0.0.0 due to incorrect IPv4 byte extraction
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

$ git diff
diff --cc go-controller/pkg/kubevirt/pod.go
index 8cde9d713,3e423744f..000000000
--- a/go-controller/pkg/kubevirt/pod.go
+++ b/go-controller/pkg/kubevirt/pod.go
@@@ -532,7 -547,13 +532,17 @@@ func (r *DefaultGatewayReconciler) Reco
               if gwIP == nil {
                       continue
               }
++<<<<<<< HEAD
+              garp := util.GARP{IP: gwIP, MAC: &lrpMAC}
++=======
+               if config.Layer2UsesTransitRouter {
+                       gwMAC = util.IPAddrToHWAddr(gwIP)
+               }
+               garp, err := util.NewGARP(gwIP, &gwMAC)
+               if err != nil {
+                       return fmt.Errorf("failed to create GARP for gateway IP %s: %w", gwIP, err)
+               }
++>>>>>>> cc15dc1c0 (Fix GARP sending 0.0.0.0 due to incorrect IPv4 byte extraction)
               if err := util.BroadcastGARP(r.interfaceName, garp); err != nil {
                       return err
               }

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.

[cgoncalves]

/retest-required

[huiran0826]

/jira refresh

[openshift-ci-robot]

@huiran0826: This pull request references Jira Issue OCPBUGS-65618, which is valid.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.20.z) matches configured target version for branch (4.20.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-61285 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-61285 targets the "4.21.0" version, which is one of the valid target versions: 4.21.0
• bug has dependents

Requesting review from QA contact:
/cc @huiran0826

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.

[anuragthehatter]

/verified by @anuragthehatter

[openshift-ci-robot]

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

In response to this:

/verified by @anuragthehatter

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.

[anuragthehatter]

/test e2e-aws-ovn-local-gateway

[anuragthehatter]

/test e2e-aws-ovn-windows

[openshift-ci]

@cgoncalves: 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	6ea54c7	link	false	/test security

Full PR test history. Your PR dashboard.

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.

[kyrtapz]

/lgtm
/label backport-risk-assessed
/override ci/prow/lint

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cgoncalves, kyrtapz

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

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [kyrtapz]

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

[openshift-ci]

@kyrtapz: Overrode contexts on behalf of kyrtapz: ci/prow/lint

In response to this:

/lgtm
/label backport-risk-assessed
/override ci/prow/lint

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.

[kyrtapz]

https://issues.redhat.com/browse/OCPBUGS-65903
/override ci/prow/e2e-aws-ovn-windows

[openshift-ci]

@kyrtapz: Overrode contexts on behalf of kyrtapz: ci/prow/e2e-aws-ovn-windows

In response to this:

https://issues.redhat.com/browse/OCPBUGS-65903
/override ci/prow/e2e-aws-ovn-windows

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-ci-robot]

@cgoncalves: Jira Issue Verification Checks: Jira Issue OCPBUGS-65618
✔️ 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-65618 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

In response to this:

• Upstream PR: Fix GARP sending 0.0.0.0 due to incorrect IPv4 byte extraction ovn-kubernetes/ovn-kubernetes#5654
• Downstream PR: OCPBUGS-61285,OCPBUGS-57053: DownStream Merge [11-13-2025] #2859

Conflict in go-controller/pkg/kubevirt/pod.go coming from 3e07236

$ git cherry-pick -x cc15dc1c0b87dcd98e2c8eb48fe06080aede552a 
Auto-merging go-controller/pkg/kubevirt/pod.go
CONFLICT (content): Merge conflict in go-controller/pkg/kubevirt/pod.go
Auto-merging test/e2e/egressip.go
Auto-merging test/e2e/util.go
error: could not apply cc15dc1c0... Fix GARP sending 0.0.0.0 due to incorrect IPv4 byte extraction
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

$ git diff
diff --cc go-controller/pkg/kubevirt/pod.go
index 8cde9d713,3e423744f..000000000
--- a/go-controller/pkg/kubevirt/pod.go
+++ b/go-controller/pkg/kubevirt/pod.go
@@@ -532,7 -547,13 +532,17 @@@ func (r *DefaultGatewayReconciler) Reco
               if gwIP == nil {
                       continue
               }
++<<<<<<< HEAD
+              garp := util.GARP{IP: gwIP, MAC: &lrpMAC}
++=======
+               if config.Layer2UsesTransitRouter {
+                       gwMAC = util.IPAddrToHWAddr(gwIP)
+               }
+               garp, err := util.NewGARP(gwIP, &gwMAC)
+               if err != nil {
+                       return fmt.Errorf("failed to create GARP for gateway IP %s: %w", gwIP, err)
+               }
++>>>>>>> cc15dc1c0 (Fix GARP sending 0.0.0.0 due to incorrect IPv4 byte extraction)
               if err := util.BroadcastGARP(r.interfaceName, garp); err != nil {
                       return err
               }

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.