Skip to content

Conversation

@jcaamano
Copy link
Contributor

@jcaamano jcaamano commented Nov 5, 2025

Cherrypick of upstream fix ovn-kubernetes/ovn-kubernetes#5579 from 0e9f3c7

Conflicts:

  • go-controller/pkg/node/controllers/egressip/egressip.go: import re-ordering
  • go-controller/pkg/node/egressip/gateway_egressip.go: changes not needed as those were new files introduced for UDN support

Added commit in a lightweight attempt to fix compilation errors from previous backports.

Aligning it to what we do for primary nic EIPv6 addresses. NODAD is
required since it is possible for an EIPv6 to be configured in two nodes
at the same time during a short failover time window.

Signed-off-by: Jaime Caamaño Ruiz <[email protected]>
(cherry picked from commit b828680)
(cherry picked from commit 0e9f3c7)
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 5, 2025
@jcaamano
Copy link
Contributor Author

jcaamano commented Nov 5, 2025

/jira cherrypick OCPBUGS-63459

@openshift-ci-robot
Copy link
Contributor

@jcaamano: Jira Issue OCPBUGS-63459 has been cloned as Jira Issue OCPBUGS-64674. Will retitle bug to link to clone.
/retitle OCPBUGS-64674: [release-4.17]: Configure sec nic EIPv6 address with NODAD and maximum lifetime

In response to this:

/jira cherrypick OCPBUGS-63459

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.17]: Configure sec nic EIPv6 address with NODAD and maximum lifetime OCPBUGS-64674: [release-4.17]: Configure sec nic EIPv6 address with NODAD and maximum lifetime Nov 5, 2025
@openshift-ci-robot openshift-ci-robot added jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Nov 5, 2025
@openshift-ci-robot
Copy link
Contributor

@jcaamano: This pull request references Jira Issue OCPBUGS-64674, 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-63459 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-63459 targets the "4.18.z" version, which is one of the valid target versions: 4.18.0, 4.18.z
  • bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

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

In response to this:

Cherrypick of upstream fix ovn-kubernetes/ovn-kubernetes#5579 from 0e9f3c7

Conflicts:

  • go-controller/pkg/node/controllers/egressip/egressip.go: import re-ordering
  • go-controller/pkg/node/egressip/gateway_egressip.go: changes not needed as those were new files introdoced for UDN support

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
Copy link
Contributor

@jcaamano: This pull request references Jira Issue OCPBUGS-64674, 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-63459 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-63459 targets the "4.18.z" version, which is one of the valid target versions: 4.18.0, 4.18.z
  • bug has dependents

Requesting review from QA contact:
/cc @anuragthehatter

In response to this:

Cherrypick of upstream fix ovn-kubernetes/ovn-kubernetes#5579 from 0e9f3c7

Conflicts:

  • go-controller/pkg/node/controllers/egressip/egressip.go: import re-ordering
  • go-controller/pkg/node/egressip/gateway_egressip.go: changes not needed as those were new files introdoced for UDN support

Added commit iin a lightweight attempt to fix compilation errors from previous backports.

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.

@jcaamano
Copy link
Contributor Author

jcaamano commented Nov 5, 2025

/override ci/prow/security

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 5, 2025

@jcaamano: Overrode contexts on behalf of jcaamano: ci/prow/security

In response to this:

/override ci/prow/security

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.

@jcaamano
Copy link
Contributor Author

jcaamano commented Nov 6, 2025

/retest

1 similar comment
@jcaamano
Copy link
Contributor Author

jcaamano commented Nov 6, 2025

/retest

@jcaamano
Copy link
Contributor Author

jcaamano commented Nov 7, 2025

/override ci/prow/4.17-upgrade-from-stable-4.16-e2e-gcp-ovn-rt-upgrade

Unrelated failure
https://redhat-internal.slack.com/archives/CK1AE4ZCK/p1762421249897769

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 7, 2025

@jcaamano: Overrode contexts on behalf of jcaamano: ci/prow/4.17-upgrade-from-stable-4.16-e2e-gcp-ovn-rt-upgrade

In response to this:

/override ci/prow/4.17-upgrade-from-stable-4.16-e2e-gcp-ovn-rt-upgrade

Unrelated failure
https://redhat-internal.slack.com/archives/CK1AE4ZCK/p1762421249897769

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
Copy link
Contributor

kyrtapz commented Nov 7, 2025

/lgtm
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Nov 7, 2025
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 7, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 7, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcaamano, 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:

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

@huiran0826
Copy link

/verified by @huiran0826

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 10, 2025
@openshift-ci-robot
Copy link
Contributor

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

In response to this:

/verified by @huiran0826

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
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD b0bc347 and 2 for PR HEAD 43b2d93 in total

@jcaamano
Copy link
Contributor Author

/retest

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 11, 2025

@jcaamano: all tests passed!

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.

@openshift-merge-bot openshift-merge-bot bot merged commit e088f89 into openshift:release-4.17 Nov 11, 2025
26 checks passed
@openshift-ci-robot
Copy link
Contributor

@jcaamano: Jira Issue Verification Checks: Jira Issue OCPBUGS-64674
✔️ 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-64674 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:

Cherrypick of upstream fix ovn-kubernetes/ovn-kubernetes#5579 from 0e9f3c7

Conflicts:

  • go-controller/pkg/node/controllers/egressip/egressip.go: import re-ordering
  • go-controller/pkg/node/egressip/gateway_egressip.go: changes not needed as those were new files introduced for UDN support

Added commit in a lightweight attempt to fix compilation errors from previous backports.

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.

@jcaamano
Copy link
Contributor Author

/cherry-pick release-4.16

@openshift-cherrypick-robot

@jcaamano: #2843 failed to apply on top of branch "release-4.16":

Applying: Configure sec nic EIPv6 address with NODAD and maximum lifetime
Using index info to reconstruct a base tree...
M	go-controller/pkg/node/controllers/egressip/egressip.go
Falling back to patching base and 3-way merge...
Auto-merging go-controller/pkg/node/controllers/egressip/egressip.go
CONFLICT (content): Merge conflict in go-controller/pkg/node/controllers/egressip/egressip.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 advice.mergeConflict false"
Patch failed at 0001 Configure sec nic EIPv6 address with NODAD and maximum lifetime

In response to this:

/cherry-pick release-4.16

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.

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

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. jira/severity-critical Referenced Jira bug's severity is critical for the branch this PR is targeting. 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. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.