Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Bug 1922997: Connect default NIC to cluster network #2384

Merged
merged 1 commit into from Feb 23, 2021
Merged

Bug 1922997: Connect default NIC to cluster network #2384

merged 1 commit into from Feb 23, 2021

Conversation

pliurh
Copy link
Contributor

@pliurh pliurh commented Feb 2, 2021

- What I did
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1922997

- How to verify it
Conduct SDN migration, then rollback

- Description for the changelog
Connect default NIC to cluster network if it is not triggered automatically, after rolling back to ovn-kubernetes.

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Feb 2, 2021
@openshift-ci-robot
Copy link
Contributor

@pliurh: This pull request references Bugzilla bug 1922997, which is invalid:

  • expected the bug to target the "4.7.0" release, but it targets "---" instead

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

In response to this:

Bug 1922997: Connect default NIC to cluster network

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/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Feb 2, 2021
@pliurh
Copy link
Contributor Author

pliurh commented Feb 2, 2021

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Feb 2, 2021
@openshift-ci-robot
Copy link
Contributor

@pliurh: This pull request references Bugzilla bug 1922997, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

/bugzilla 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 kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Feb 2, 2021
@pliurh
Copy link
Contributor Author

pliurh commented Feb 2, 2021

/retest

@pliurh
Copy link
Contributor Author

pliurh commented Feb 2, 2021

/cc @trozet @danwinship

@pliurh
Copy link
Contributor Author

pliurh commented Feb 3, 2021

/retest

4 similar comments
@pliurh
Copy link
Contributor Author

pliurh commented Feb 3, 2021

/retest

@pliurh
Copy link
Contributor Author

pliurh commented Feb 3, 2021

/retest

@pliurh
Copy link
Contributor Author

pliurh commented Feb 4, 2021

/retest

@pliurh
Copy link
Contributor Author

pliurh commented Feb 4, 2021

/retest

rbbratta
rbbratta reviewed Feb 4, 2021
View reviewed changes
templates/common/_base/files/configure-ovs-network.yaml Outdated
@@ -280,6 +280,7 @@ contents:
# Remove OVS bridge "br-ex". Use the default NIC for cluster network.

if nmcli connection show ovs-port-phys0 &> /dev/null; then
iface=$(nmcli connection show ovs-port-phys0 | grep connection.interface-name| awk '{print $2}')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we use get-values?

nmcli --get-values connection.interface-name connection show ovs-port-phys0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

templates/common/_base/files/configure-ovs-network.yaml Outdated
@@ -302,4 +303,8 @@ contents:
rm -f /etc/NetworkManager/system-connections/{br-ex,ovs-if-br-ex,ovs-port-br-ex,ovs-if-phys0,ovs-port-phys0}.nmconnection
# remove bridges created by ovn-kubernetes, try to delete br-ex again in case NM fail to talk to ovsdb
ovs-vsctl --timeout=30 --if-exists del-br br-int -- --if-exists del-br br-local -- --if-exists del-br br-ex

if [ "$iface" != "" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe if [ -n "$iface" ]; then

but really we should be using [[ with bash.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

@rbbratta
Copy link
Contributor

rbbratta commented Feb 4, 2021

Syntax Error!

Why aren't we running shellcheck on this!

    if [ -z "$vlan_id"]; then
configure-ovs-network.sh:140:5: note: The mentioned syntax error was in this if expression. [SC1009]
configure-ovs-network.sh:140:8: error: Couldn't parse this test expression. Fix to allow more checks. [SC1073]
configure-ovs-network.sh:140:13: error: Expected this to be an argument to the unary condition. [SC1019]
configure-ovs-network.sh:140:24: error: You need a space before the ]. [SC1020]
configure-ovs-network.sh:140:24: error: Missing space before ]. Fix any mentioned problems and try again. [SC1072]

@rbbratta
Copy link
Contributor

rbbratta commented Feb 4, 2021

https://bugzilla.redhat.com/show_bug.cgi?id=1925319

@pliurh
Connect default NIC to cluster network
5971cfa 
Connect default NIC to cluster network, if it is not triggered automantically.
@pliurh
Copy link
Contributor Author

pliurh commented Feb 5, 2021

/retest

2 similar comments
@pliurh
Copy link
Contributor Author

pliurh commented Feb 5, 2021

/retest

@pliurh
Copy link
Contributor Author

pliurh commented Feb 5, 2021

/retest

@pliurh pliurh requested a review from rbbratta February 5, 2021 10:26
@pliurh
Copy link
Contributor Author

pliurh commented Feb 5, 2021

/retest

@pliurh
Copy link
Contributor Author

pliurh commented Feb 5, 2021

@trozet PTAL

@pliurh
Copy link
Contributor Author

pliurh commented Feb 5, 2021

/retest

@rbbratta
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 23, 2021
@pliurh
Copy link
Contributor Author

pliurh commented Feb 23, 2021

/assign @sinnykumari

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pliurh, rbbratta, sinnykumari

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 23, 2021
@openshift-merge-robot openshift-merge-robot merged commit 1402af2 into openshift:master Feb 23, 2021
@openshift-ci-robot
Copy link
Contributor

@pliurh: All pull requests linked via external trackers have merged:

Bugzilla bug 1922997 has been moved to the MODIFIED state.

In response to this:

Bug 1922997: Connect default NIC to cluster network

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/test-infra repository.

@pliurh
Copy link
Contributor Author

pliurh commented Feb 24, 2021

/cherry-pick release-4.7

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Feb 24, 2021
Merged
@openshift-cherrypick-robot
Copy link

@pliurh: new pull request created: #2427

In response to this:

/cherry-pick release-4.7

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/test-infra repository.

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

@sinnykumari sinnykumari sinnykumari approved these changes

@kikisdeliveryservice kikisdeliveryservice Awaiting requested review from kikisdeliveryservice

@danwinship danwinship Awaiting requested review from danwinship

@trozet trozet Awaiting requested review from trozet

@rbbratta rbbratta Awaiting requested review from rbbratta

Assignees

@rbbratta rbbratta

@sinnykumari sinnykumari

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@pliurh @openshift-ci-robot @rbbratta @openshift-cherrypick-robot @sinnykumari @openshift-merge-robot