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

🐛 Prevent orphaned InfrastructureMachines #5875

Conversation

k8s-infra-cherrypick-robot

This is an automated cherry-pick of #5865

/assign fabriziopandini

@k8s-ci-robot k8s-ci-robot added this to the v1.0 milestone Dec 16, 2021
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 16, 2021
@fabriziopandini
Copy link
Member

/retitle 🐛 Prevent orphaned InfrastructureMachines

@k8s-ci-robot k8s-ci-robot changed the title [release-1.0] 🐛 Prevent orphaned InfrastructureMachines 🐛 Prevent orphaned InfrastructureMachines Dec 16, 2021
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vincepri

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 lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 16, 2021
@k8s-ci-robot k8s-ci-robot merged commit 58f3ef5 into kubernetes-sigs:release-1.0 Dec 16, 2021
@fabriziopandini
Copy link
Member

/cherry-pick release-0.4

@k8s-infra-cherrypick-robot
Copy link
Author

@fabriziopandini: #5875 failed to apply on top of branch "release-0.4":

Applying: Prevent orphaned InfrastructureMachines
Using index info to reconstruct a base tree...
M	controllers/machineset_controller.go
M	controllers/machineset_controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/machineset_controller_test.go
CONFLICT (content): Merge conflict in controllers/machineset_controller_test.go
Auto-merging controllers/machineset_controller.go
CONFLICT (content): Merge conflict in controllers/machineset_controller.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 Prevent orphaned InfrastructureMachines
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-0.4

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. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants