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 1956318: Revert "removing the hybrid overlay externalGW code" #521

Merged
merged 4 commits into from May 6, 2021

Conversation

trozet
Copy link
Contributor

@trozet trozet commented May 3, 2021

Adds back external gw code via hybrid overlay. Also includes various missing unit test fixes downstream that were causing lint and formatting issues.

trozet and others added 4 commits May 3, 2021 09:58
This reverts commit b77e0e3.

(cherry picked from commit 2cd6c4c)
Unit test fix only. A required function for unit test had been
accidentally removed on backport.

Signed-off-by: Tim Rozet <trozet@redhat.com>
Fix lint issues with the downstream OCP hack.

Signed-off-by: Aniket Bhat <anbhat@redhat.com>
(cherry picked from commit 25a8ec0)
Unit test fix only for 4.7 and earlier.

Signed-off-by: Tim Rozet <trozet@redhat.com>
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-urgent Referenced Bugzilla bug's severity is urgent for the branch this PR is targeting. label May 3, 2021
@openshift-ci-robot
Copy link
Contributor

@trozet: This pull request references Bugzilla bug 1956318, which is invalid:

  • expected the bug to target the "4.7.z" release, but it targets "4.8.0" instead
  • expected dependent Bugzilla bug 1952262 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is ON_QA 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 1956318: Revert "removing the hybrid overlay externalGW code"

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 May 3, 2021
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 3, 2021
@trozet
Copy link
Contributor Author

trozet commented May 3, 2021

/bugzilla refresh

@openshift-ci-robot
Copy link
Contributor

@trozet: This pull request references Bugzilla bug 1956318, which is invalid:

  • expected dependent Bugzilla bug 1952262 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but it is ON_QA 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:

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

@dcbw
Copy link
Member

dcbw commented May 3, 2021

Compared 4.7 before exGW revert to this PR:

git checkout release-4.7
git reset --hard 05894787208a828410c27302e24f57e012a2a44c
git diff ..trozet/bz1956318 go-controller/hybrid-overlay/ go-controller/pkg/ovn/ovn.go go-controller/pkg/ovn/pods.go

and only differences are in pkg/ovn/ovn.go and pods.go. hybrid-overlay code is exactly the same.

/lgtm

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dcbw, 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 lgtm Indicates that a PR is ready to be merged. label May 3, 2021
@trozet
Copy link
Contributor Author

trozet commented May 3, 2021

thanks @dcbw

@trozet
Copy link
Contributor Author

trozet commented May 3, 2021

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels May 3, 2021
@openshift-ci-robot
Copy link
Contributor

@trozet: This pull request references Bugzilla bug 1956318, which is valid.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.7.z) matches configured target release for branch (4.7.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1952262 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 1952262 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0
  • bug has dependents

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

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.

@knobunc knobunc added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label May 6, 2021
@openshift-merge-robot openshift-merge-robot merged commit cb51bf0 into openshift:release-4.7 May 6, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 6, 2021

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

Bugzilla bug 1956318 has been moved to the MODIFIED state.

In response to this:

Bug 1956318: Revert "removing the hybrid overlay externalGW code"

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-urgent Referenced Bugzilla bug's severity is urgent 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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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