Skip to content

Conversation

@lentzi90
Copy link
Contributor

What this PR does / why we need it:

If the bastion image is missing or ambiguous, we do not have a bastion. In that case, we must continue with the deletion or be permanently stuck.

This is a direct PR for release-0.10 since the issue doesn't exist on main.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #2266

Special notes for your reviewer:

  1. Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

TODOs:

  • squashed commits
  • if necessary:
    • includes documentation
    • adds unit tests

/hold

If the bastion image is missing or ambiguous, we do not have a bastion.
In that case, we must continue with the deletion or be permanently
stuck.

Signed-off-by: Lennart Jern <[email protected]>
@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 28, 2024
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 28, 2024
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 28, 2024
@netlify
Copy link

netlify bot commented Nov 28, 2024

Deploy Preview for kubernetes-sigs-cluster-api-openstack ready!

Name Link
🔨 Latest commit c62b21f
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-cluster-api-openstack/deploys/67484817f0878d0008dc4e8b
😎 Deploy Preview https://deploy-preview-2291--kubernetes-sigs-cluster-api-openstack.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@lentzi90
Copy link
Contributor Author

/test pull-cluster-api-provider-openstack-e2e-test

@EmilienM
Copy link
Contributor

EmilienM commented Dec 2, 2024

/approve
/lgtm
/cherry-pick release-0.11

Thanks!

@k8s-infra-cherrypick-robot

@EmilienM: once the present PR merges, I will cherry-pick it on top of release-0.11 in a new PR and assign it to you.

In response to this:

/approve
/lgtm
/cherry-pick release-0.11

Thanks!

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-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 2, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: EmilienM

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 2, 2024
@EmilienM
Copy link
Contributor

EmilienM commented Dec 2, 2024

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 2, 2024
@k8s-ci-robot k8s-ci-robot merged commit efcbbe9 into kubernetes-sigs:release-0.10 Dec 3, 2024
8 of 9 checks passed
@k8s-infra-cherrypick-robot

@EmilienM: #2291 failed to apply on top of branch "release-0.11":

Applying: Fix deletion of cluster when bastion image missing
Using index info to reconstruct a base tree...
M	controllers/openstackcluster_controller.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/openstackcluster_controller.go
CONFLICT (content): Merge conflict in controllers/openstackcluster_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Fix deletion of cluster when bastion image missing

In response to this:

/approve
/lgtm
/cherry-pick release-0.11

Thanks!

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-sigs/prow repository.

@lentzi90 lentzi90 deleted the lentzi90/fix-bastion-deletion-release-0.10 branch December 3, 2024 06:07
@lentzi90
Copy link
Contributor Author

lentzi90 commented Dec 3, 2024

No need to cherry-pick. This issue does not exist on release-0.11 🙂

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants