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.

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

Bug 1854306: Run ovn in shared gw mode when configure-ovs.sh run with parameter OVNKubernetes #793

Merged
merged 1 commit into from Sep 24, 2020

Conversation

pliurh
Copy link
Contributor

@pliurh pliurh commented Sep 16, 2020

ovs-configuration.service is enabled for both ovn-kube and openshift-sdn. So using the parameter of configure-ovs.sh as the condition to tell whether ovnkube shall be in a shared gw or local gw mode. In 4.5, this parameter is not added yet.

@pliurh
Copy link
Contributor Author

pliurh commented Sep 16, 2020

/hold
don't merge before openshift/machine-config-operator#2066 merged

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 16, 2020
@pliurh
Copy link
Contributor Author

pliurh commented Sep 21, 2020

@trozet I am not sure whether we still need this logic anymore since we will not run ovn-kube in old local gw mode.

@pliurh pliurh changed the title Run ovn in shared gw mode when configure-ovs.sh run with parameter OVNKubernetes Bug 1854306: Run ovn in shared gw mode when configure-ovs.sh run with parameter OVNKubernetes Sep 23, 2020
@openshift-ci-robot openshift-ci-robot added 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. labels Sep 23, 2020
@openshift-ci-robot
Copy link
Contributor

@pliurh: This pull request references Bugzilla bug 1854306, which is valid. 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.6.0) matches configured target release for branch (4.6.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1854306: Run ovn in shared gw mode when configure-ovs.sh run with parameter OVNKubernetes

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 Sep 23, 2020

/unhold

@danwinship
Copy link
Contributor

/assign @trozet
but I think this is irrelevant now

(if it's not, then you need to rebase because there's currently a merge commit there)

@pliurh
Copy link
Contributor Author

pliurh commented Sep 24, 2020

/assign @trozet
but I think this is irrelevant now

(if it's not, then you need to rebase because there's currently a merge commit there)

It's still relevant. Now the ovs-configuration.service is always enabled on 4.6 nodes, so we cannot use the file as the condition anymore. This PR makes the DaemonSets can be rendered correctly in the following 3 scenarios:

  1. During an upgrade, 4.6 pods on 4.5 host, no ovs-configuration.service, run with --gateway-interface none.
  2. Normal case, 4.6 pods on 4.6 host, ovs-configuration.service rendered with OVNKubernetes, run with --gateway-interface br-ex.
  3. The intermediate stage of migration, 4.6 pods on 4.6 host, ovs-configuration.service rendered with Openshift-SDN, run with --gateway-interface none.

@trozet
Copy link
Contributor

trozet commented Sep 24, 2020

for ovn 4.5-> 4.6 this change doesn't matter, but it is required for openshift sdn-> ovn conversion

Copy link
Contributor

@trozet trozet left a comment

Choose a reason for hiding this comment

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

/lgtm

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

pliurh commented Sep 24, 2020

/retest

1 similar comment
@pliurh
Copy link
Contributor Author

pliurh commented Sep 24, 2020

/retest

@danwinship
Copy link
Contributor

/approve

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danwinship, pliurh, trozet

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 Sep 24, 2020
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Sep 24, 2020

@pliurh: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-azure 81fcbeb link /test e2e-azure

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/test-infra repository. I understand the commands that are listed here.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 58d91b4 into openshift:master Sep 24, 2020
@openshift-ci-robot
Copy link
Contributor

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

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Bugzilla bug in order for it to move to the next state.

Bugzilla bug 1854306 has not been moved to the MODIFIED state.

In response to this:

Bug 1854306: Run ovn in shared gw mode when configure-ovs.sh run with parameter OVNKubernetes

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
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
Development

Successfully merging this pull request may close these issues.

None yet

6 participants