-
Notifications
You must be signed in to change notification settings - Fork 447
OPNET-681,OCPBUGS-57484: Support migration to NMState #5064
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.
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
OPNET-681,OCPBUGS-57484: Support migration to NMState #5064
Conversation
@cybertron: This pull request references OPNET-681 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.20.0" version, but no target version was set. In response to this:
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. |
/retest-required Image pull failed |
/retest-required |
/cc @mkowalski @emy This has some overlap with the disruptive change work because in that case br-ex will already exist too. I think it should be fine since we'll be reconfiguring it anyway, but it will be something to test. |
Even though configure-ovs uses in-memory profiles to ensure we are starting with a clean slate on each boot, the OVS database may still have leftover artifacts in it. This causes issues if you try to switch to using NMState to manage br-ex because the entries conflict with what NMState does. This patch simply adds a call to delete br-ex from the ovsdb if it exists when we apply an NMState configuration.
7536665
to
12878e4
Compare
@cybertron: This pull request references OPNET-681 which is a valid jira issue. This pull request references Jira Issue OCPBUGS-57484, which is invalid:
Comment The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
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. |
@cybertron: This pull request references OPNET-681 which is a valid jira issue. This pull request references Jira Issue OCPBUGS-57484, which is invalid:
Comment In response to this:
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. |
/jira refresh |
@cybertron: This pull request references OPNET-681 which is a valid jira issue. This pull request references Jira Issue OCPBUGS-57484, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
Requesting review from QA contact: In response to this:
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. |
ovs-vsctl --timeout=30 --if-exists del-br br-ex | ||
# Handle the case where we're migrating from OpenShift SDN | ||
ovs-vsctl --timeout=30 --if-exists del-br br0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can this script be invoked when a node is running with SDN? If yes, we cannot remove br0
in that case.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should not be used with OpenShift SDN. It's specific to configuring br-ex for OVNKubernetes.
doesn't seem to work, or it didn't delete |
Nevermind, bad NMstate failed to create |
tested with MachineConfig. OVN-K migration successful.
|
|
/label qe-approved |
/retest-required I see a string of passes from yesterday. Maybe this is fixed? |
/lgtm |
/assign @djoshy |
/approve
Hopefully - we think #5184 was the issue |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cybertron, djoshy, mkowalski 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 |
1 similar comment
@cybertron: The following tests failed, say
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. |
46bdad2
into
openshift:main
@cybertron: Jira Issue OCPBUGS-57484: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-57484 has been moved to the MODIFIED state. In response to this:
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. |
/jira backport release-4.19,release-4.18,release-4.17,release-4.16 |
@mkowalski: The following backport issues have been created:
Queuing cherrypicks to the requested branches to be created after this PR merges: In response to this:
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: new pull request created: #5205 In response to this:
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: new pull request created: #5206 In response to this:
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: new pull request created: #5207 In response to this:
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: new pull request created: #5208 In response to this:
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. |
[ART PR BUILD NOTIFIER] Distgit: ose-machine-config-operator |
This PR adds logic to handle two migration paths to NMState: one from an existing OVNK cluster using configure-ovs, and one from OpenShift SDN directly to NMState without ever using configure-ovs.
In the former case, we need to clean up the left over remnants of configure-ovs's br-ex configuration. In the latter we need to clean up br0, which would otherwise have been done by configure-ovs.
- What I did
- How to verify it
- Description for the changelog