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

[release-1.6] 🐛 Improve handling of topology orphaned objects #10326

Conversation

fabriziopandini
Copy link
Member

What this PR does / why we need it:
manual backport of #10277

/area clusterclass

/cc @sbueringer @chrischdi

@k8s-ci-robot k8s-ci-robot added this to the v1.6 milestone Mar 27, 2024
@k8s-ci-robot k8s-ci-robot added area/clusterclass Issues or PRs related to clusterclass cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Mar 27, 2024
@sbueringer
Copy link
Member

Diffed against upstream/main. Diff looks good!

/lgtm

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

LGTM label has been added.

Git tree hash: 8a18f2ad6b414dea5056eebcfe3c44d0272ee859

@chrischdi
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi

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 Mar 27, 2024
@k8s-ci-robot k8s-ci-robot merged commit f967c2f into kubernetes-sigs:release-1.6 Mar 27, 2024
22 checks passed
@fabriziopandini
Copy link
Member Author

/cherry-pick release-1.5

@k8s-infra-cherrypick-robot

@fabriziopandini: #10326 failed to apply on top of branch "release-1.5":

Applying: Avoid leaving orphaned InfrastructureCluster when create control plane fails
Using index info to reconstruct a base tree...
M	internal/controllers/topology/cluster/reconcile_state.go
M	internal/controllers/topology/cluster/reconcile_state_test.go
Falling back to patching base and 3-way merge...
Auto-merging internal/controllers/topology/cluster/reconcile_state_test.go
Auto-merging internal/controllers/topology/cluster/reconcile_state.go
CONFLICT (content): Merge conflict in internal/controllers/topology/cluster/reconcile_state.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 Avoid leaving orphaned InfrastructureCluster when create control plane fails
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-1.5

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.

@fabriziopandini fabriziopandini deleted the improve-handling-of-reconcileCP-errors branch March 27, 2024 12:13
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. area/clusterclass Issues or PRs related to clusterclass 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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants