🌱 Drop usage of v1beta1 conditions #12109

fabriziopandini · 2025-04-17T18:06:59Z

What this PR does / why we need it:

Do not review, work in progress, I'm using this PR mostly to check everything looks good in CI but most probably I will later re-submit in a few smaller PR

Which issue(s) this PR fixes:
Fixes #

/area conditions

k8s-ci-robot · 2025-04-17T18:07:09Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign chrischdi for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

fabriziopandini · 2025-04-17T18:07:12Z

/test?

k8s-ci-robot · 2025-04-17T18:07:15Z

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

/test pull-cluster-api-build-main

/test pull-cluster-api-e2e-blocking-main

/test pull-cluster-api-e2e-conformance-ci-latest-main

/test pull-cluster-api-e2e-conformance-main

/test pull-cluster-api-e2e-latestk8s-main

/test pull-cluster-api-e2e-main

/test pull-cluster-api-e2e-mink8s-main

/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

/test pull-cluster-api-test-main

/test pull-cluster-api-test-mink8s-main

/test pull-cluster-api-verify-main

The following commands are available to trigger optional jobs:

/test pull-cluster-api-apidiff-main

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

pull-cluster-api-apidiff-main

pull-cluster-api-build-main

pull-cluster-api-e2e-blocking-main

pull-cluster-api-test-main

pull-cluster-api-verify-main

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.

fabriziopandini · 2025-04-17T18:07:41Z

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

fabriziopandini · 2025-04-18T16:03:56Z

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

fabriziopandini · 2025-04-21T12:53:03Z

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

fabriziopandini · 2025-04-22T14:05:34Z

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

fabriziopandini · 2025-04-22T19:48:46Z

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

fabriziopandini · 2025-04-23T08:11:10Z

/test pull-cluster-api-e2e-main

fabriziopandini · 2025-04-24T20:36:45Z

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

fabriziopandini · 2025-04-25T17:27:15Z

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

fabriziopandini · 2025-04-25T21:21:17Z

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

…conditions management only)

…in controllers

# Conflicts: # internal/controllers/machine/machine_controller_test.go

…in controllers

…lers

…ollers

…erv1.MachineHealthCheckSucceededV1Beta1Condition in controllers

…in controllers

… in controllers

… controllers

…trolplanev1.ControlPlaneComponentsHealthyV1Beta1Condition in controllers

fabriziopandini · 2025-05-08T17:13:47Z

/test pull-cluster-api-e2e-conformance-ci-latest-main
/test pull-cluster-api-e2e-conformance-main
/test pull-cluster-api-e2e-latestk8s-main
/test pull-cluster-api-e2e-main
/test pull-cluster-api-e2e-mink8s-main
/test pull-cluster-api-e2e-upgrade-1-32-1-33-main

sbueringer · 2025-05-09T07:41:00Z

/test pull-cluster-api-e2e-latestk8s-main

Looks like just a flake

bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go

controlplane/kubeadm/internal/controllers/controller.go

sbueringer · 2025-05-09T08:31:02Z

controlplane/kubeadm/internal/controllers/remediation_test.go

 	}
 }

 func withUnhealthyAPIServerPod() machineOption {
 	return func(machine *clusterv1.Machine) {
-		v1beta1conditions.MarkFalse(machine, controlplanev1.MachineAPIServerPodHealthyV1Beta1Condition, controlplanev1.ControlPlaneComponentsUnhealthyV1Beta1Reason, clusterv1.ConditionSeverityError, "")
+		conditions.Set(machine, metav1.Condition{Type: controlplanev1.KubeadmControlPlaneMachineAPIServerPodHealthyCondition, Status: metav1.ConditionFalse, Reason: controlplanev1.KubeadmControlPlaneMachinePodRunningReason})


nit: "KubeadmControlPlaneMachinePodRunningReason" doesn't seem to make sense here

What do you suggest, using another const name or change the const value to something else

This condition is false, so "Running" seems like the wrong reason :) (it should be some failed reason instead, I don't mind which one)

conditions.Set(machine, metav1.Condition{Type: controlplanev1.KubeadmControlPlaneMachineAPIServerPodHealthyCondition, Status: metav1.ConditionFalse, Reason: controlplanev1.KubeadmControlPlaneMachinePodFailedReason})

controlplane/kubeadm/internal/workload_cluster_conditions.go

internal/controllers/cluster/cluster_controller.go

internal/webhooks/cluster_test.go

test/e2e/cluster_upgrade_runtimesdk.go

test/e2e/cluster_upgrade_test.go

test/framework/machine_helpers.go

util/collections/machine_filters_test.go

sbueringer · 2025-05-09T13:28:55Z

bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go

@@ -358,8 +358,7 @@ func (r *KubeadmConfigReconciler) reconcile(ctx context.Context, scope *Scope, c
 	}


Audited for usages of the deprecated v1beta1 condition packages.

These are the results:

test/e2e: 1x v1beta1conditions.IsFalse + 1x v1beta1conditions.Get directly below

CAPD:

2x v1beta1conditions.GetReason

1x v1beta1conditions.Has

a few times v1beta1conditions.IsTrue

a few times v1beta1conditions.Get

I suspect CAPD is expected at this point. Can you please check that this remaining work is properly tracked?

If I got it right:

test/e2e: 1x v1beta1conditions.IsFalse -> MachinePool 😢

test/e2e: 1x v1beta1conditions.Get directly below -> It is a check for MS MachinesCreated condition, which doesn't have an equivalent in v1beta2

I suspect CAPD is expected at this point -> Correct, it is tracked

k8s-ci-robot · 2025-05-09T15:07:42Z

@fabriziopandini: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-apidiff-main	`0cb1aee`	link	false	`/test pull-cluster-api-apidiff-main`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. area/conditions Issues or PRs related to conditions cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 17, 2025

k8s-ci-robot requested review from elmiko and JoelSpeed April 17, 2025 18:07

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Apr 17, 2025

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 18, 2025

k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 22, 2025

fabriziopandini force-pushed the drop-usage-of-v1beta1-conditions branch from 8816570 to 5e3fd7f Compare April 25, 2025 17:27

fabriziopandini force-pushed the drop-usage-of-v1beta1-conditions branch from 5e3fd7f to 754995b Compare April 25, 2025 18:21

sbueringer mentioned this pull request May 7, 2025

Tracking issue for v1Beta2 #11947

Open

72 tasks

fabriziopandini mentioned this pull request May 8, 2025

⚠️ Stop using deprecated replica counters in controllers #12149

Merged

fabriziopandini added 4 commits May 8, 2025 18:07

Accept usage of clusterv1.ResizedV1Beta1Condition (it is for v1beta1 …

c7684b5

…conditions management only)

Stop using clusterv1.ClusterClassVariablesReconciledV1Beta1Condition …

f6cc58a

…in controllers

Stop using clusterv1.TopologyReconciledV1Beta1Condition in controllers

8c5b241

Stop using clusterv1.MachineNodeHealthyV1Beta1Condition in controllers

63fbfb7

# Conflicts: # internal/controllers/machine/machine_controller_test.go

fabriziopandini added 15 commits May 8, 2025 18:10

Stop using clusterv1.PreTerminateDeleteHookSucceededV1Beta1Condition …

bda6a89

…in controllers

Stop using clusterv1.DrainingSucceededV1Beta1Condition in controllers

35e79cc

Stop using clusterv1.VolumeDetachSucceededV1Beta1Condition in control…

0a7a72d

…lers

Stop using clusterv1.BootstrapReadyV1Beta1Condition in controllers

9e440ef

Stop using clusterv1.ControlPlaneInitializedV1Beta1Condition in contr…

2ba98f9

…ollers

Stop using clusterv1.InfrastructureReadyV1Beta1Condition in controllers

5553721

Stop using clusterv1.ReadyV1Beta1Condition in controllers

498f277

Stop using clusterv1.MachineOwnerRemediatedV1Beta1Condition and clust…

5d2d5c9

…erv1.MachineHealthCheckSucceededV1Beta1Condition in controllers

Stop using clusterv1.bootstrapv1.DataSecretAvailableV1Beta1Condition …

e14b75b

…in controllers

Stop using controlplanev1.KubeadmControlPlaneMachine*HealthyCondition…

da2d1f5

… in controllers

Stop using controlplanev1.controlplanev1.AvailableV1Beta1Condition in…

7e67c9e

… controllers

Stop using controlplanev1..EtcdClusterHealthyV1Beta1Condition and con…

5033489

…trolplanev1.ControlPlaneComponentsHealthyV1Beta1Condition in controllers

Drop unnecessary TODO

b0df78e

Small cleanups

3c138c7

Fix tests

e06c3bc

fabriziopandini force-pushed the drop-usage-of-v1beta1-conditions branch from 754995b to e06c3bc Compare May 8, 2025 17:13

fabriziopandini changed the title ~~[WIP] 🌱 Drop usage of v1beta1 conditions~~ 🌱 Drop usage of v1beta1 conditions May 8, 2025

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 8, 2025

sbueringer reviewed May 9, 2025

View reviewed changes

Address comments

0cb1aee

sbueringer added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label May 9, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🌱 Drop usage of v1beta1 conditions #12109

🌱 Drop usage of v1beta1 conditions #12109

fabriziopandini commented Apr 17, 2025

k8s-ci-robot commented Apr 17, 2025

fabriziopandini commented Apr 17, 2025

k8s-ci-robot commented Apr 17, 2025

fabriziopandini commented Apr 17, 2025

fabriziopandini commented Apr 18, 2025

fabriziopandini commented Apr 21, 2025

fabriziopandini commented Apr 22, 2025

fabriziopandini commented Apr 22, 2025

fabriziopandini commented Apr 23, 2025

fabriziopandini commented Apr 24, 2025

fabriziopandini commented Apr 25, 2025

fabriziopandini commented Apr 25, 2025

fabriziopandini commented May 8, 2025

sbueringer commented May 9, 2025

sbueringer May 9, 2025

fabriziopandini May 9, 2025

sbueringer May 9, 2025 •

edited

Loading

sbueringer May 9, 2025

fabriziopandini May 9, 2025

k8s-ci-robot commented May 9, 2025

		@@ -358,8 +358,7 @@ func (r KubeadmConfigReconciler) reconcile(ctx context.Context, scope Scope, c
		}

🌱 Drop usage of v1beta1 conditions #12109

Are you sure you want to change the base?

🌱 Drop usage of v1beta1 conditions #12109

Conversation

fabriziopandini commented Apr 17, 2025

k8s-ci-robot commented Apr 17, 2025

fabriziopandini commented Apr 17, 2025

k8s-ci-robot commented Apr 17, 2025

fabriziopandini commented Apr 17, 2025

fabriziopandini commented Apr 18, 2025

fabriziopandini commented Apr 21, 2025

fabriziopandini commented Apr 22, 2025

fabriziopandini commented Apr 22, 2025

fabriziopandini commented Apr 23, 2025

fabriziopandini commented Apr 24, 2025

fabriziopandini commented Apr 25, 2025

fabriziopandini commented Apr 25, 2025

fabriziopandini commented May 8, 2025

sbueringer commented May 9, 2025

sbueringer May 9, 2025

Choose a reason for hiding this comment

fabriziopandini May 9, 2025

Choose a reason for hiding this comment

sbueringer May 9, 2025 • edited Loading

Choose a reason for hiding this comment

sbueringer May 9, 2025

Choose a reason for hiding this comment

fabriziopandini May 9, 2025

Choose a reason for hiding this comment

k8s-ci-robot commented May 9, 2025

sbueringer May 9, 2025 •

edited

Loading