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.

Sign up for GitHub

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

Jump to bottom

🌱 controllers: fix vspherecluster test flake on vspherecluster deletion #3393

Merged
merged 1 commit into from
Mar 14, 2025
Merged

🌱 controllers: fix vspherecluster test flake on vspherecluster deletion #3393

merged 1 commit into from
Mar 14, 2025

Conversation

chrischdi
Copy link
Member

@chrischdi chrischdi commented Mar 13, 2025 •
edited
Loading

What this PR does / why we need it:

Fixes a test-flake occuring since:

xref: https://prow.k8s.io/view/gs/kubernetes-ci-logs/logs/periodic-cluster-api-provider-vsphere-test-main/1900193124035072000

{Timed out after 30.073s.
Expected
    <bool>: false
to be true failed [FAILED] Timed out after 30.073s.
Expected
    <bool>: false
to be true
In [It] at: /home/prow/go/src/sigs.k8s.io/cluster-api-provider-vsphere/controllers/vspherecluster_reconciler_test.go:308 @ 03/13/25 14:40:01.629
}

Note: reproducible by adding a time.Sleep just before the deletion, so the finalizer gets added before deleting again.

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 #

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 13, 2025
@k8s-ci-robot k8s-ci-robot requested review from laozc and srm09 March 13, 2025 17:25
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 13, 2025
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 13, 2025
@chrischdi
Copy link
Member Author

/hold that's the wrong solution

@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 Mar 13, 2025
@chrischdi
Copy link
Member Author

/hold cancel

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 13, 2025
@chrischdi chrischdi mentioned this pull request Mar 13, 2025
Merged
@chrischdi
Copy link
Member Author

/hold for mirror prow

@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 Mar 13, 2025
@sbueringer
Copy link
Member

Ping me once everything is green

chrischdi
chrischdi commented Mar 13, 2025
View reviewed changes
controllers/vspherecluster_reconciler.go

if annotations.IsPaused(cluster, vsphereCluster) {
if cluster != nil && cluster.Spec.Paused || annotations.HasPaused(vsphereCluster) {
Copy link
Member Author

Choose a reason for hiding this comment

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

Note: this gets simplified with the paused conditions PR.

@chrischdi
Copy link
Member Author

/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 Mar 14, 2025
@chrischdi chrischdi mentioned this pull request Mar 14, 2025
Merged
@sbueringer
Copy link
Member

Thx!

/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 Mar 14, 2025
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 0d21e9b8ae374451e86a04f95b1d2d3e7df35fe2

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 14, 2025
@k8s-ci-robot k8s-ci-robot merged commit 7035312 into kubernetes-sigs:main Mar 14, 2025
14 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.13 milestone Mar 14, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@laozc laozc

@srm09 srm09

Assignees

@sbueringer sbueringer

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
Milestone
v1.13
Development

Successfully merging this pull request may close these issues.
3 participants
@chrischdi @sbueringer @k8s-ci-robot