-
Notifications
You must be signed in to change notification settings - Fork 190
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
OCPBUGS-13078: Remove externalGatewayInterface from configure-ovs.sh #1888
Conversation
@pliurh: This pull request references Jira Issue OCPBUGS-13078, 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 kubernetes/test-infra repository. |
@pliurh: This pull request references Jira Issue OCPBUGS-13078, 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 kubernetes/test-infra repository. |
/jira refresh |
@pliurh: This pull request references Jira Issue OCPBUGS-13078, which is valid. The bug has been moved to the POST state. 3 validation(s) were run on this bug
No GitHub users were found matching the public email listed for the QA contact in Jira (dhensel@redhat.com), skipping review request. 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/test-infra repository. |
/cc @zshi-redhat |
@pliurh do we need the logic in configure-ovs.sh to handle upgrade (e.g. remove the br-ex1)? |
Added the logic to remove br-ex1. |
/retest |
packaging/systemd/configure-ovs.sh
Outdated
# Check if we need to remove the second bridge | ||
if [ ! -f "$extra_bridge_file" ] && (nmcli connection show br-ex1 &> /dev/null || nmcli connection show ovs-if-phys1 &> /dev/null); then | ||
# Remove the second bridge | ||
if [ -f "$extra_bridge_file" ] && (nmcli connection show br-ex1 &> /dev/null || nmcli connection show ovs-if-phys1 &> /dev/null); then |
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.
Shall we remove the check [ -f "$extra_bridge_file" ]
?
In line 760, the second bridge and interfaces are not going to be activated even if $extra_bridge_file exist.
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 is for removing the existing extra bridge NM config files if they exist.
@@ -757,9 +746,6 @@ if [ "$1" == "OVNKubernetes" ]; then | |||
fi | |||
done < <(nmcli -g NAME c) | |||
connections+=(ovs-if-phys0 ovs-if-br-ex) | |||
if [ -f "$extra_bridge_file" ]; then |
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.
the $extra_bridge_file is used in other places in the script, do we want to remove them all at once in this PR or leave it until the detach ovnk gateway change lands in microshift?
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.
We will remove most of the content from configure-ovs.sh in 4.14 when the detach ovnk gateway change lands. All the NM configurations will be removed when users upgrade to 4.14.
When we backport this PR to 4.13, for clusters that have br-ex1 configured, we need to keep extra_bridge_file
in the script to ensure the behavior of get_default_interface
is unchanged during upgrade.
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.
ack+.
Ignore externalGatewayInterface flag in ovn.yaml. Remove br-ex1, if it exists. Signed-off-by: Peng Liu <pliu@redhat.com>
/retest |
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: pliurh, zshi-redhat 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 |
@pliurh: Jira Issue OCPBUGS-13078: All pull requests linked via external trackers have merged: Jira Issue OCPBUGS-13078 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 kubernetes/test-infra repository. |
/cherrypick release-4.13 |
@pliurh: new pull request created: #1921 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/test-infra repository. |
Ignore externalGatewayInterface flag in ovn.yaml.