Skip to content

Conversation

@AndiDog
Copy link
Contributor

@AndiDog AndiDog commented Nov 21, 2025

What type of PR is this?

/kind bug
/area machinepool

What this PR does / why we need it:

This fixes the error invalid secret backend because CAPA mistakenly tries to delete bootstrap data that won't ever exist for machine pool machines as their bootstrapping is done from another controller. See other places where if !machineScope.IsMachinePoolMachine() was already correctly used.

The fix is critical because currently, clusters would fail to continue deletion as the reconciliation logic is stopped at the mentioned error.

This has been working in our fork for a while already (giantswarm#630).

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

n/a

Special notes for your reviewer:

Checklist:

  • squashed commits
  • includes documentation
  • includes emoji in title
  • adds unit tests
  • adds or updates e2e tests

Release note:

Only try to delete AWSMachine bootstrap data for non-machine pool machines

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. area/machinepool labels Nov 21, 2025
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 21, 2025
@AndiDog
Copy link
Contributor Author

AndiDog commented Nov 21, 2025

/assign @richardcase

@nrb
Copy link
Contributor

nrb commented Nov 21, 2025

/lgtm
/approve

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

LGTM label has been added.

Git tree hash: 87830eff06f29b813c619b5190125b0bf8390313

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nrb

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 Nov 21, 2025
@k8s-ci-robot k8s-ci-robot merged commit ed98c60 into kubernetes-sigs:main Nov 21, 2025
23 checks passed
@AndiDog AndiDog deleted the machine-pool-machine-deletion branch December 3, 2025 11:34
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/machinepool cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants