Skip to content

Bug 1880591: Allow local no bridge#281

Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
trozet:allow_local_no_bridge
Sep 25, 2020
Merged

Bug 1880591: Allow local no bridge#281
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
trozet:allow_local_no_bridge

Conversation

@trozet
Copy link
Contributor

@trozet trozet commented Sep 22, 2020

For OCP we upgrade CNO before MCO. This means that ovn-k8s will get upgraded first when 4.5->4.6 upgrade happens and will try to create a bridge for local gateway mode now. We have to have an intermediate step where we do not create a shared gateway bridge until after the node reboots with ovs-configuration. Therefore this downstream only patch allows us to launch local gateway mode with no shared gateway bridge, and it should still function during upgrade.

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. labels Sep 22, 2020
@openshift-ci-robot
Copy link
Contributor

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

In response to this:

[WIP] Bug 1880591: Allow local no bridge

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/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Sep 22, 2020
@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 22, 2020
trozet added a commit to trozet/cluster-network-operator that referenced this pull request Sep 22, 2020
We have now switched back to using local gateway mode in ovn-kubernetes.
This is currently forced in ovn-k8s with a hack. This patch sets it
correctly in CNO and we will revert the hack in ovn-k8s.

Additionally, this passes the gateway-interface of "none" when
ovs-configuration is not available. This allows us to do upgrade via

openshift/ovn-kubernetes#281

Signed-off-by: Tim Rozet <trozet@redhat.com>
@trozet
Copy link
Contributor Author

trozet commented Sep 22, 2020

@danwinship @pliurh @dcbw this will allow us to launch local gw mode with no shared gw bridge for upgrade and openshift-sdn-> ovn-k8s conversion. I have a corresponding PR for CNO:
openshift/cluster-network-operator#801

and another PR that forces gateway-interface to be none just to ensure functionality still works in this mode:
#282

@trozet
Copy link
Contributor Author

trozet commented Sep 22, 2020

cluster-botAPP 5:26 PM
job test upgrade 4.5.8 #281,openshift/cluster-network-operator#801 aws,ovn succeeded

@trozet trozet force-pushed the allow_local_no_bridge branch from d0e548c to d4e9bb8 Compare September 23, 2020 14:39
@trozet trozet changed the title [WIP] Bug 1880591: Allow local no bridge Bug 1880591: Allow local no bridge Sep 23, 2020
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 23, 2020
@trozet trozet force-pushed the allow_local_no_bridge branch from d4e9bb8 to 6b909e0 Compare September 23, 2020 19:13
Since local gateway mode only needs the shared gateway bridge for egress
gw and potentially egress IP features, we can disable it by passing a
gateway-interface of "none". We need this temporarily to be able to
upgrade from a previous local gateway cluster to a local gateway mode
using the shared topology.

Signed-off-by: Tim Rozet <trozet@redhat.com>
@trozet trozet force-pushed the allow_local_no_bridge branch from 6b909e0 to 3e850d9 Compare September 23, 2020 19:45
@trozet
Copy link
Contributor Author

trozet commented Sep 23, 2020

/retest

1 similar comment
@trozet
Copy link
Contributor Author

trozet commented Sep 24, 2020

/retest

@abhat
Copy link
Contributor

abhat commented Sep 24, 2020

/test e2e-gcp-ovn
/test e2e-azure-ovn

@trozet
Copy link
Contributor Author

trozet commented Sep 24, 2020

/retest

@danwinship
Copy link
Contributor

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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

@trozet
Copy link
Contributor Author

trozet commented Sep 24, 2020

/retest

1 similar comment
@trozet
Copy link
Contributor Author

trozet commented Sep 24, 2020

/retest

@openshift-bot
Copy link
Contributor

/retest

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

@trozet
Copy link
Contributor Author

trozet commented Sep 25, 2020

/override ci/prow/e2e-gcp-ovn

@openshift-ci-robot
Copy link
Contributor

@trozet: Overrode contexts on behalf of trozet: ci/prow/e2e-gcp-ovn

Details

In response to this:

/override ci/prow/e2e-gcp-ovn

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
Copy link
Contributor

openshift-ci-robot commented Sep 25, 2020

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

Test name Commit Details Rerun command
ci/prow/e2e-azure d4e9bb8 link /test e2e-azure
ci/prow/e2e-azure-ovn 3e850d9 link /test e2e-azure-ovn

Full PR test history. Your PR dashboard.

Details

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.

@trozet
Copy link
Contributor Author

trozet commented Sep 25, 2020

/retest

@openshift-merge-robot openshift-merge-robot merged commit 3a42420 into openshift:master Sep 25, 2020
@openshift-ci-robot
Copy link
Contributor

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

Bugzilla bug 1880591 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1880591: Allow local no bridge

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.

6 participants