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.

Sign up for GitHub

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

Jump to bottom

Bug 2066406: OpenStack+Kuryr: Fix cluster destroy with BYON #5754

Merged
merged 2 commits into from Mar 30, 2022
Merged

Bug 2066406: OpenStack+Kuryr: Fix cluster destroy with BYON #5754

merged 2 commits into from Mar 30, 2022

Conversation

dulek
Copy link
Contributor

@dulek dulek commented Mar 28, 2022

This includes two backports that are required for cluster destroy with bring your own network mode to work. One backport comes from this BZ [1] and is related to FIPs and second one [2] makes sure all subnets are removed from the created router, not only tagged ones.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1924701
[2] https://bugzilla.redhat.com/show_bug.cgi?id=1940159

@MaysaMacedo @dulek
Fix FIP detach from Router
195b986 
During a FIP less installation VMs that were not
created by the installer can get a FIP detached when
the cluster in being destroyed. This commit fixes the
issue by detaching only FIPs that were created by
installer or Kuryr during a FIP less installation.
@MaysaMacedo @dulek
Fix Routers destroy with BYO
6e26e9c 
When using your own Network for the Machines
connected to a tagged Router created by CNO
on an installation with Kuryr, the Subnet of
that Network is not tagged and consequently
not identified by installer when destroying
the Router. This commit fixes the issue by
ensuring all Subnetes connected to a Router
created by Installer or CNO are removed.
@openshift-ci openshift-ci bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Mar 28, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 28, 2022

@dulek: This pull request references Bugzilla bug 2066406, which is invalid:

  • expected the bug to target the "4.7.z" release, but it targets "---" instead
  • expected Bugzilla bug 2066406 to depend on a bug targeting a release in 4.8.0, 4.8.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but no dependents were found

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 2066406: OpenStack+Kuryr: Fix cluster destroy with BYON

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 EmilienM and mandre March 28, 2022 14:52
@dulek
Copy link
Contributor Author

dulek commented Mar 28, 2022

/bugzilla refresh

@openshift-ci openshift-ci bot 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 Mar 28, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 28, 2022

@dulek: This pull request references Bugzilla bug 2066406, 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.

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 NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 1940159 is in the state CLOSED (ERRATA), which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 1940159 targets the "4.8.0" release, which is one of the valid target releases: 4.8.0, 4.8.z
  • bug has dependents

Requesting review from QA contact:
/cc @eurijon

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.

@openshift-ci openshift-ci bot requested a review from eurijon March 28, 2022 14:58
@dulek
Copy link
Contributor Author

dulek commented Mar 29, 2022

/test e2e-openstack

@dulek
Copy link
Contributor Author

dulek commented Mar 29, 2022

/test e2e-openstack-kuryr

@dulek
Copy link
Contributor Author

dulek commented Mar 29, 2022

@pierreprinetti, @MaysaMacedo, @mandre: OpenStack jobs are happy, this is ready for reviews. It's just combining two backports.

mandre
mandre reviewed Mar 29, 2022
View reviewed changes
Copy link
Member

@mandre mandre left a comment

Choose a reason for hiding this comment

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

Interesting that we had #4616 already in 4.8, but didn't bother to get all the fixes in. One more case for more proactive backports.
/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 29, 2022
@mandre
Copy link
Member

mandre commented Mar 29, 2022

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Mar 29, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 29, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mandre

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 openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 29, 2022
@dulek
Copy link
Contributor Author

dulek commented Mar 29, 2022

@eurijon

@pierreprinetti
Copy link
Member

/retest-required

@openshift-bot
Copy link
Contributor

/retest-required

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

1 similar comment
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 29, 2022 •
edited

@dulek: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-crc 6e26e9c link false /test e2e-crc
ci/prow/e2e-aws-workers-rhel7 6e26e9c link false /test e2e-aws-workers-rhel7
ci/prow/e2e-libvirt 6e26e9c link false /test e2e-libvirt
ci/prow/e2e-ovirt 6e26e9c link false /test e2e-ovirt
ci/prow/e2e-aws-fips 6e26e9c link false /test e2e-aws-fips

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

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

2 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

2 similar comments
@openshift-bot
Copy link
Contributor

/retest-required

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

@openshift-bot
Copy link
Contributor

/retest-required

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

@mandre
Copy link
Member

mandre commented Mar 30, 2022

/skip

@openshift-bot
Copy link
Contributor

/retest-required

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

@eurijon
Copy link

eurijon commented Mar 30, 2022

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Mar 30, 2022
@openshift-merge-robot openshift-merge-robot merged commit 4b386e9 into openshift:release-4.7 Mar 30, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Mar 30, 2022

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

Bugzilla bug 2066406 has been moved to the MODIFIED state.

In response to this:

Bug 2066406: OpenStack+Kuryr: Fix cluster destroy with BYON

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.

@dulek
Copy link
Contributor Author

dulek commented Apr 29, 2022

/cherry-pick release-4.6

@openshift-cherrypick-robot
Copy link

@dulek: #5754 failed to apply on top of branch "release-4.6":

Applying: Fix FIP detach from Router
Using index info to reconstruct a base tree...
M	pkg/destroy/openstack/openstack.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/destroy/openstack/openstack.go
CONFLICT (content): Merge conflict in pkg/destroy/openstack/openstack.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix FIP detach from Router
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.6

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
Reviewers

@mandre mandre mandre left review comments

@EmilienM EmilienM Awaiting requested review from EmilienM

@eurijon eurijon Awaiting requested review from eurijon

Assignees

@mandre mandre

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@dulek @mandre @pierreprinetti @openshift-bot @eurijon @openshift-cherrypick-robot @openshift-merge-robot @MaysaMacedo