Skip to content

✨ Wait for AWSCluster dependent object to be deleted#5365

Merged
k8s-ci-robot merged 1 commit intokubernetes-sigs:mainfrom
alexander-demicev:waitforclusterdependencies
Mar 6, 2025
Merged

✨ Wait for AWSCluster dependent object to be deleted#5365
k8s-ci-robot merged 1 commit intokubernetes-sigs:mainfrom
alexander-demicev:waitforclusterdependencies

Conversation

@alexander-demicev
Copy link
Copy Markdown
Contributor

@alexander-demicev alexander-demicev commented Feb 27, 2025 •
edited
Loading

What type of PR is this?
/kind feature

What this PR does / why we need it:

This PR adds a similar check

cluster-api-provider-aws/controlplane/eks/controllers/awsmanagedcontrolplane_controller.go

Line 394 in 4e912b4

numDependencies, err := r.dependencyCount(ctx, managedScope)
for AWSCluster. It ensures all machines are gone before proceeding with deletion.

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 #5107

Special notes for your reviewer:

Checklist:

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

Release note:

Wait for AWSCluster dependent object to be deleted

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 27, 2025
@k8s-ci-robot k8s-ci-robot added needs-priority size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Feb 27, 2025
@richardcase
Copy link
Copy Markdown
Member

richardcase commented Feb 28, 2025

Thanks for this @alexander-demicev . Looks good to me. Lets check that the e2e still pass.

@richardcase
Copy link
Copy Markdown
Member

richardcase commented Feb 28, 2025

/test ?

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Feb 28, 2025

@richardcase: The following commands are available to trigger required jobs:

/test pull-cluster-api-provider-aws-build

/test pull-cluster-api-provider-aws-build-docker

/test pull-cluster-api-provider-aws-test

/test pull-cluster-api-provider-aws-verify

The following commands are available to trigger optional jobs:

/test pull-cluster-api-provider-aws-apidiff-main

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

/test pull-cluster-api-provider-aws-e2e-blocking

/test pull-cluster-api-provider-aws-e2e-clusterclass

/test pull-cluster-api-provider-aws-e2e-conformance

/test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts

/test pull-cluster-api-provider-aws-e2e-eks

/test pull-cluster-api-provider-aws-e2e-eks-gc

/test pull-cluster-api-provider-aws-e2e-eks-testing

Use /test all to run the following jobs that were automatically triggered:

pull-cluster-api-provider-aws-apidiff-main

pull-cluster-api-provider-aws-build

pull-cluster-api-provider-aws-build-docker

pull-cluster-api-provider-aws-test

pull-cluster-api-provider-aws-verify
Details

In response to this:

/test ?

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.

@richardcase
Copy link
Copy Markdown
Member

richardcase commented Feb 28, 2025

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

1 similar comment
@alexander-demicev
Copy link
Copy Markdown
Contributor Author

alexander-demicev commented Mar 3, 2025

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

@damdo damdo added this to the v2.8 milestone Mar 3, 2025
damdo
damdo reviewed Mar 4, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

Looks good, left a couple of non-blocking nits on the log lines.
Thanks for fixing this @alexander-demicev

Wait for AWSCluster dependent object to be deleted
4113f2a 
Signed-off-by: Alexandr Demicev <alexandr.demicev@suse.com>
@alexander-demicev alexander-demicev force-pushed the waitforclusterdependencies branch from 29e4d2e to 4113f2a Compare March 6, 2025 11:13
damdo
damdo reviewed Mar 6, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

/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 6, 2025
@damdo
Copy link
Copy Markdown
Member

damdo commented Mar 6, 2025

Thanks @alexander-demicev

/assign @richardcase @nrb

@nrb
Copy link
Copy Markdown
Contributor

nrb commented Mar 6, 2025

/approve

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Mar 6, 2025

[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

Details 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 6, 2025
@k8s-ci-robot k8s-ci-robot merged commit 241384f into kubernetes-sigs:main Mar 6, 2025
17 checks passed
@alexander-demicev alexander-demicev deleted the waitforclusterdependencies branch March 7, 2025 09:30
@salasberryfin salasberryfin mentioned this pull request Mar 25, 2025
Merged
3 tasks
yongs2 pushed a commit to yongs2/cluster-api-provider-aws that referenced this pull request Jul 21, 2025
@k8s-ci-robot @yongs2
Merge pull request kubernetes-sigs#5365 from alexander-demicev/waitfo…
d5ad5f6 
…rclusterdependencies

✨ Wait for AWSCluster dependent object to be deleted
@alexander-demicev alexander-demicev mentioned this pull request Feb 11, 2026
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@damdo damdo damdo left review comments

@AndiDog AndiDog Awaiting requested review from AndiDog

@richardcase richardcase Awaiting requested review from richardcase

Assignees

@richardcase richardcase

@nrb nrb

@damdo damdo

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. kind/feature Categorizes issue or PR as related to a new feature. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

v2.8

Development

Successfully merging this pull request may close these issues.

Cluster deletion stuck due to AWSCluster finalizer issue

5 participants

@alexander-demicev @richardcase @k8s-ci-robot @damdo @nrb