Skip to content

OCPBUGS-13078: Remove externalGatewayInterface from configure-ovs.sh#1888

Merged
openshift-merge-robot merged 1 commit into
openshift:mainfrom
pliurh:remove_flag
Jun 9, 2023
Merged

OCPBUGS-13078: Remove externalGatewayInterface from configure-ovs.sh#1888
openshift-merge-robot merged 1 commit into
openshift:mainfrom
pliurh:remove_flag

Conversation

@pliurh
Copy link
Copy Markdown
Contributor

@pliurh pliurh commented Jun 6, 2023 •
edited
Loading

Ignore externalGatewayInterface flag in ovn.yaml.

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 6, 2023
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jun 6, 2023

@pliurh: This pull request references Jira Issue OCPBUGS-13078, which is invalid:

  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is ON_QA 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.

Details

In response to this:

Which issue(s) this PR addresses:

Closes #

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 openshift-ci Bot requested review from dhellmann and jerpeter1 June 6, 2023 08:23
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 6, 2023
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jun 6, 2023

@pliurh: This pull request references Jira Issue OCPBUGS-13078, which is invalid:

  • expected the bug to be in one of the following states: NEW, ASSIGNED, POST, but it is ON_QA 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.

Details

In response to this:

Ignore externalGatewayInterface flag in ovn.yaml.

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
Copy Markdown
Contributor Author

pliurh commented Jun 6, 2023

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jun 6, 2023
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jun 6, 2023

@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
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira (dhensel@redhat.com), skipping review request.

Details

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

@pliurh
Copy link
Copy Markdown
Contributor Author

pliurh commented Jun 6, 2023

/cc @zshi-redhat

@openshift-ci openshift-ci Bot requested a review from zshi-redhat June 6, 2023 08:26
@zshi-redhat
Copy link
Copy Markdown
Contributor

zshi-redhat commented Jun 6, 2023

@pliurh do we need the logic in configure-ovs.sh to handle upgrade (e.g. remove the br-ex1)?

@pliurh
Copy link
Copy Markdown
Contributor Author

pliurh commented Jun 6, 2023

Added the logic to remove br-ex1.

@pliurh
Copy link
Copy Markdown
Contributor Author

pliurh commented Jun 8, 2023

/retest

zshi-redhat
zshi-redhat reviewed Jun 9, 2023
View reviewed changes
Comment thread packaging/systemd/configure-ovs.sh Outdated
Copy link
Copy Markdown
Contributor

@zshi-redhat zshi-redhat Jun 9, 2023

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.

Copy link
Copy Markdown
Contributor Author

@pliurh pliurh Jun 9, 2023

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.

Comment thread packaging/systemd/configure-ovs.sh Outdated
Copy link
Copy Markdown
Contributor

@zshi-redhat zshi-redhat Jun 9, 2023

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?

Copy link
Copy Markdown
Contributor Author

@pliurh pliurh Jun 9, 2023 •
edited
Loading

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.

Copy link
Copy Markdown
Contributor

@zshi-redhat zshi-redhat Jun 9, 2023

Choose a reason for hiding this comment

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

ack+.

@pliurh
Remove externalGatewayInterface from configure-ovs.sh
2a7dcf5 
Ignore externalGatewayInterface flag in ovn.yaml. Remove br-ex1,
if it exists.

Signed-off-by: Peng Liu <pliu@redhat.com>
@pliurh
Copy link
Copy Markdown
Contributor Author

pliurh commented Jun 9, 2023

/retest

@zshi-redhat
Copy link
Copy Markdown
Contributor

zshi-redhat commented Jun 9, 2023

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 9, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 9, 2023

[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

Details 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-merge-robot openshift-merge-robot merged commit 687e7d3 into openshift:main Jun 9, 2023
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Jun 9, 2023

@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.

Details

In response to this:

Ignore externalGatewayInterface flag in ovn.yaml.

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
Copy Markdown
Contributor Author

pliurh commented Jun 13, 2023

/cherrypick release-4.13

@openshift-cherrypick-robot
Copy link
Copy Markdown

openshift-cherrypick-robot commented Jun 13, 2023

@pliurh: new pull request created: #1921

Details

In response to this:

/cherrypick release-4.13

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-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jun 13, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dhellmann dhellmann Awaiting requested review from dhellmann

@jerpeter1 jerpeter1 Awaiting requested review from jerpeter1

1 more reviewer

@zshi-redhat zshi-redhat zshi-redhat left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@zshi-redhat zshi-redhat

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-important Referenced Jira bug's severity is important 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.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@pliurh @openshift-ci-robot @zshi-redhat @openshift-cherrypick-robot @openshift-merge-robot