🌱 Drop usage of v1beta1 conditions

bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go

@@ -358,8 +358,7 @@ func (r *KubeadmConfigReconciler) reconcile(ctx context.Context, scope *Scope, c
 	}
 
 	// Note: can't use IsFalse here because we need to handle the absence of the condition as well as false.
-	// TODO (v1beta2): test for v1beta2 conditions
-	if !v1beta1conditions.IsTrue(cluster, clusterv1.ControlPlaneInitializedV1Beta1Condition) {
+	if !conditions.IsTrue(cluster, clusterv1.ClusterControlPlaneInitializedCondition) {
 		return r.handleClusterNotInitialized(ctx, scope)
 	}
 
@@ -483,8 +482,7 @@ func (r *KubeadmConfigReconciler) handleClusterNotInitialized(ctx context.Contex
 	// initialize the DataSecretAvailableCondition if missing.
 	// this is required in order to avoid the condition's LastTransitionTime to flicker in case of errors surfacing
 	// using the DataSecretGeneratedFailedReason
-	// TODO (v1beta2): test for v1beta2 conditions
-	if v1beta1conditions.GetReason(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition) != bootstrapv1.DataSecretGenerationFailedV1Beta1Reason {
+	if !conditions.Has(scope.Config, bootstrapv1.KubeadmConfigDataSecretAvailableCondition) {
 		v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, clusterv1.WaitingForControlPlaneAvailableV1Beta1Reason, clusterv1.ConditionSeverityInfo, "")
 		conditions.Set(scope.Config, metav1.Condition{
 			Type:    bootstrapv1.KubeadmConfigDataSecretAvailableCondition,

cmd/clusterctl/client/cluster/mover.go

@@ -40,7 +40,7 @@ import (
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
 	clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
 	logf "sigs.k8s.io/cluster-api/cmd/clusterctl/log"
-	v1beta1conditions "sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1"
+	"sigs.k8s.io/cluster-api/util/conditions"
 	"sigs.k8s.io/cluster-api/util/patch"
 	"sigs.k8s.io/cluster-api/util/yaml"
 )
@@ -246,8 +246,7 @@ func (o *objectMover) checkProvisioningCompleted(ctx context.Context, graph *obj
 		}
 
 		// Note: can't use IsFalse here because we need to handle the absence of the condition as well as false.
-		// TODO (v1beta2): test for v1beta2 conditions
-		if !v1beta1conditions.IsTrue(clusterObj, clusterv1.ControlPlaneInitializedV1Beta1Condition) {
+		if !conditions.IsTrue(clusterObj, clusterv1.ClusterControlPlaneInitializedCondition) {
 			errList = append(errList, errors.Errorf("cannot start the move operation while the control plane for %q %s/%s is not yet initialized", clusterObj.GroupVersionKind(), clusterObj.GetNamespace(), clusterObj.GetName()))
 			continue
 		}

cmd/clusterctl/client/cluster/mover_test.go

@@ -42,7 +42,6 @@ import (
 	clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/internal/test"
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/internal/test/providers/infrastructure"
-	v1beta1conditions "sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1"
 )
 
 type moveTestsFields struct {
@@ -1461,12 +1460,8 @@ func Test_objectMover_checkProvisioningCompleted(t *testing.T) {
 						},
 						Status: clusterv1.ClusterStatus{
 							Initialization: &clusterv1.ClusterInitializationStatus{InfrastructureProvisioned: false},
-							Deprecated: &clusterv1.ClusterDeprecatedStatus{
-								V1Beta1: &clusterv1.ClusterV1Beta1DeprecatedStatus{
-									Conditions: clusterv1.Conditions{
-										*v1beta1conditions.TrueCondition(clusterv1.ControlPlaneInitializedV1Beta1Condition),
-									},
-								},
+							Conditions: []metav1.Condition{
+								{Type: clusterv1.ClusterControlPlaneInitializedCondition, Status: metav1.ConditionTrue},
 							},
 						},
 					},
@@ -1510,12 +1505,8 @@ func Test_objectMover_checkProvisioningCompleted(t *testing.T) {
 						},
 						Status: clusterv1.ClusterStatus{
 							Initialization: &clusterv1.ClusterInitializationStatus{InfrastructureProvisioned: true},
-							Deprecated: &clusterv1.ClusterDeprecatedStatus{
-								V1Beta1: &clusterv1.ClusterV1Beta1DeprecatedStatus{
-									Conditions: clusterv1.Conditions{
-										*v1beta1conditions.FalseCondition(clusterv1.ControlPlaneInitializedV1Beta1Condition, "", clusterv1.ConditionSeverityInfo, ""),
-									},
-								},
+							Conditions: []metav1.Condition{
+								{Type: clusterv1.ClusterControlPlaneInitializedCondition, Status: metav1.ConditionFalse},
 							},
 						},
 					},
@@ -1541,12 +1532,8 @@ func Test_objectMover_checkProvisioningCompleted(t *testing.T) {
 						},
 						Status: clusterv1.ClusterStatus{
 							Initialization: &clusterv1.ClusterInitializationStatus{InfrastructureProvisioned: true},
-							Deprecated: &clusterv1.ClusterDeprecatedStatus{
-								V1Beta1: &clusterv1.ClusterV1Beta1DeprecatedStatus{
-									Conditions: clusterv1.Conditions{
-										*v1beta1conditions.TrueCondition(clusterv1.ControlPlaneInitializedV1Beta1Condition),
-									},
-								},
+							Conditions: []metav1.Condition{
+								{Type: clusterv1.ClusterControlPlaneInitializedCondition, Status: metav1.ConditionTrue},
 							},
 						},
 					},
@@ -1570,12 +1557,8 @@ func Test_objectMover_checkProvisioningCompleted(t *testing.T) {
 						},
 						Status: clusterv1.ClusterStatus{
 							Initialization: &clusterv1.ClusterInitializationStatus{InfrastructureProvisioned: true},
-							Deprecated: &clusterv1.ClusterDeprecatedStatus{
-								V1Beta1: &clusterv1.ClusterV1Beta1DeprecatedStatus{
-									Conditions: clusterv1.Conditions{
-										*v1beta1conditions.TrueCondition(clusterv1.ControlPlaneInitializedV1Beta1Condition),
-									},
-								},
+							Conditions: []metav1.Condition{
+								{Type: clusterv1.ClusterControlPlaneInitializedCondition, Status: metav1.ConditionTrue},
 							},
 						},
 					},
@@ -1620,12 +1603,8 @@ func Test_objectMover_checkProvisioningCompleted(t *testing.T) {
 						},
 						Status: clusterv1.ClusterStatus{
 							Initialization: &clusterv1.ClusterInitializationStatus{InfrastructureProvisioned: true, ControlPlaneInitialized: true},
-							Deprecated: &clusterv1.ClusterDeprecatedStatus{
-								V1Beta1: &clusterv1.ClusterV1Beta1DeprecatedStatus{
-									Conditions: clusterv1.Conditions{
-										*v1beta1conditions.TrueCondition(clusterv1.ControlPlaneInitializedV1Beta1Condition),
-									},
-								},
+							Conditions: []metav1.Condition{
+								{Type: clusterv1.ClusterControlPlaneInitializedCondition, Status: metav1.ConditionTrue},
 							},
 						},
 					},

cmd/clusterctl/client/tree/tree.go

@@ -97,17 +97,17 @@ func (od ObjectTree) Add(parent, obj client.Object, opts ...AddObjectOption) (ad
 
 	// Get a small set of conditions that will be used to determine e.g. when grouping or when an object is just an echo of
 	// its parent.
-	var objReady, parentReady *clusterv1.Condition
-	var objAvailableV1Beta2, objReadyV1Beta2, objUpToDateV1Beta2, parentReadyV1Beta2 *metav1.Condition
+	var objReadyV1Beta1, parentReadyV1Beta1 *clusterv1.Condition
+	var objAvailable, objReady, objUpToDate, parentReady *metav1.Condition
 	switch od.options.V1Beta2 {
 	case true:
-		objAvailableV1Beta2 = GetAvailableV1Beta2Condition(obj)
-		objReadyV1Beta2 = GetReadyV1Beta2Condition(obj)
-		objUpToDateV1Beta2 = GetMachineUpToDateV1Beta2Condition(obj)
-		parentReadyV1Beta2 = GetReadyV1Beta2Condition(parent)
-	default:
+		objAvailable = GetAvailableCondition(obj)
 		objReady = GetReadyCondition(obj)
+		objUpToDate = GetMachineUpToDateCondition(obj)
 		parentReady = GetReadyCondition(parent)
+	default:
+		objReadyV1Beta1 = GetV1Beta1ReadyCondition(obj)
+		parentReadyV1Beta1 = GetV1Beta1ReadyCondition(parent)
 	}
 
 	// If it is requested to show all the conditions for the object, add
@@ -121,11 +121,11 @@ func (od ObjectTree) Add(parent, obj client.Object, opts ...AddObjectOption) (ad
 	if addOpts.NoEcho && !od.options.Echo {
 		switch od.options.V1Beta2 {
 		case true:
-			if (objReadyV1Beta2 != nil && objReadyV1Beta2.Status == metav1.ConditionTrue) || hasSameAvailableReadyUptoDateStatusAndReason(nil, nil, parentReadyV1Beta2, objReadyV1Beta2, nil, nil) {
+			if (objReady != nil && objReady.Status == metav1.ConditionTrue) || hasSameAvailableReadyUptoDateStatusAndReason(nil, nil, parentReady, objReady, nil, nil) {
 				return false, false
 			}
 		default:
-			if (objReady != nil && objReady.Status == corev1.ConditionTrue) || hasSameReadyStatusSeverityAndReason(parentReady, objReady) {
+			if (objReadyV1Beta1 != nil && objReadyV1Beta1.Status == corev1.ConditionTrue) || hasSameReadyStatusSeverityAndReason(parentReadyV1Beta1, objReadyV1Beta1) {
 				return false, false
 			}
 		}
@@ -154,24 +154,24 @@ func (od ObjectTree) Add(parent, obj client.Object, opts ...AddObjectOption) (ad
 		for i := range siblings {
 			s := siblings[i]
 
-			var sReady *clusterv1.Condition
-			var sAvailableV1Beta2, sReadyV1Beta2, sUpToDateV1Beta2 *metav1.Condition
+			var sReadyV1Beta1 *clusterv1.Condition
+			var sAvailable, sReady, sUpToDate *metav1.Condition
 			switch od.options.V1Beta2 {
 			case true:
 				// If the object's ready condition has a different Available/ReadyUpToDate condition than the sibling object,
 				// move on (they should not be grouped).
-				sAvailableV1Beta2 = GetAvailableV1Beta2Condition(s)
-				sReadyV1Beta2 = GetReadyV1Beta2Condition(s)
-				sUpToDateV1Beta2 = GetMachineUpToDateV1Beta2Condition(s)
-				if !hasSameAvailableReadyUptoDateStatusAndReason(objAvailableV1Beta2, sAvailableV1Beta2, objReadyV1Beta2, sReadyV1Beta2, objUpToDateV1Beta2, sUpToDateV1Beta2) {
+				sAvailable = GetAvailableCondition(s)
+				sReady = GetReadyCondition(s)
+				sUpToDate = GetMachineUpToDateCondition(s)
+				if !hasSameAvailableReadyUptoDateStatusAndReason(objAvailable, sAvailable, objReady, sReady, objUpToDate, sUpToDate) {
 					continue
 				}
 			default:
-				sReady = GetReadyCondition(s)
+				sReadyV1Beta1 = GetV1Beta1ReadyCondition(s)
 
 				// If the object's ready condition has a different Status, Severity and Reason than the sibling object,
 				// move on (they should not be grouped).
-				if !hasSameReadyStatusSeverityAndReason(objReady, sReady) {
+				if !hasSameReadyStatusSeverityAndReason(objReadyV1Beta1, sReadyV1Beta1) {
 					continue
 				}
 			}
@@ -183,9 +183,9 @@ func (od ObjectTree) Add(parent, obj client.Object, opts ...AddObjectOption) (ad
 				if s.GetObjectKind().GroupVersionKind().Kind == obj.GetObjectKind().GroupVersionKind().Kind+"Group" {
 					switch od.options.V1Beta2 {
 					case true:
-						updateGroupNode(s, sReadyV1Beta2, obj, objAvailableV1Beta2, objReadyV1Beta2, objUpToDateV1Beta2)
+						updateGroupNode(s, sReady, obj, objAvailable, objReady, objUpToDate)
 					default:
-						updateV1Beta1GroupNode(s, sReady, obj, objReady)
+						updateV1Beta1GroupNode(s, sReadyV1Beta1, obj, objReadyV1Beta1)
 					}
 
 					return true, false
@@ -201,9 +201,9 @@ func (od ObjectTree) Add(parent, obj client.Object, opts ...AddObjectOption) (ad
 			var groupNode *NodeObject
 			switch od.options.V1Beta2 {
 			case true:
-				groupNode = createGroupNode(s, sReadyV1Beta2, obj, objAvailableV1Beta2, objReadyV1Beta2, objUpToDateV1Beta2)
+				groupNode = createGroupNode(s, sReady, obj, objAvailable, objReady, objUpToDate)
 			default:
-				groupNode = createV1Beta1GroupNode(s, sReady, obj, objReady)
+				groupNode = createV1Beta1GroupNode(s, sReadyV1Beta1, obj, objReadyV1Beta1)
 			}
 
 			// By default, grouping objects should be sorted last.
@@ -332,7 +332,7 @@ func createGroupNode(sibling client.Object, siblingReady *metav1.Condition, obj
 	if objAvailable != nil {
 		objAvailable.LastTransitionTime = metav1.Time{}
 		objAvailable.Message = ""
-		setAvailableV1Beta2Condition(groupNode, objAvailable)
+		setAvailableCondition(groupNode, objAvailable)
 		if objAvailable.Status == metav1.ConditionTrue {
 			// When creating a group, it is already the sum of obj and its own sibling,
 			// and they all have same conditions.
@@ -345,7 +345,7 @@ func createGroupNode(sibling client.Object, siblingReady *metav1.Condition, obj
 	if objReady != nil {
 		objReady.LastTransitionTime = minLastTransitionTime(objReady, siblingReady)
 		objReady.Message = ""
-		setReadyV1Beta2Condition(groupNode, objReady)
+		setReadyCondition(groupNode, objReady)
 		if objReady.Status == metav1.ConditionTrue {
 			// When creating a group, it is already the sum of obj and its own sibling,
 			// and they all have same conditions.
@@ -358,7 +358,7 @@ func createGroupNode(sibling client.Object, siblingReady *metav1.Condition, obj
 	if objUpToDate != nil {
 		objUpToDate.LastTransitionTime = metav1.Time{}
 		objUpToDate.Message = ""
-		setUpToDateV1Beta2Condition(groupNode, objUpToDate)
+		setUpToDateCondition(groupNode, objUpToDate)
 		if objUpToDate.Status == metav1.ConditionTrue {
 			// When creating a group, it is already the sum of obj and its own sibling,
 			// and they all have same conditions.
@@ -370,7 +370,7 @@ func createGroupNode(sibling client.Object, siblingReady *metav1.Condition, obj
 }
 
 func readyStatusReasonUID(obj client.Object) string {
-	ready := GetReadyV1Beta2Condition(obj)
+	ready := GetReadyCondition(obj)
 	if ready == nil {
 		return fmt.Sprintf("zzz_%s", util.RandomString(6))
 	}
@@ -417,7 +417,7 @@ func createV1Beta1GroupNode(sibling client.Object, siblingReady *clusterv1.Condi
 }
 
 func readyStatusSeverityAndReasonUID(obj client.Object) string {
-	ready := GetReadyCondition(obj)
+	ready := GetV1Beta1ReadyCondition(obj)
 	if ready == nil {
 		return fmt.Sprintf("zzz_%s", util.RandomString(6))
 	}
@@ -459,7 +459,7 @@ func updateGroupNode(groupObj client.Object, groupReady *metav1.Condition, obj c
 	if groupReady != nil {
 		groupReady.LastTransitionTime = minLastTransitionTime(objReady, groupReady)
 		groupReady.Message = ""
-		setReadyV1Beta2Condition(groupObj, groupReady)
+		setReadyCondition(groupObj, groupReady)
 	}
 
 	if objReady != nil && objReady.Status == metav1.ConditionTrue {

cmd/clusterctl/client/tree/tree_test.go

@@ -565,7 +565,7 @@ func Test_createGroupNode(t *testing.T) {
 	}
 
 	g := NewWithT(t)
-	got := createGroupNode(sibling, GetReadyV1Beta2Condition(sibling), obj, GetAvailableV1Beta2Condition(obj), GetReadyV1Beta2Condition(obj), GetMachineUpToDateV1Beta2Condition(obj))
+	got := createGroupNode(sibling, GetReadyCondition(sibling), obj, GetAvailableCondition(obj), GetReadyCondition(obj), GetMachineUpToDateCondition(obj))
 
 	// Some values are generated randomly, so pick up them.
 	want.SetName(got.GetName())
@@ -653,7 +653,7 @@ func Test_createV1Beta1GroupNode(t *testing.T) {
 	}
 
 	g := NewWithT(t)
-	got := createV1Beta1GroupNode(sibling, GetReadyCondition(sibling), obj, GetReadyCondition(obj))
+	got := createV1Beta1GroupNode(sibling, GetV1Beta1ReadyCondition(sibling), obj, GetV1Beta1ReadyCondition(obj))
 
 	// Some values are generated randomly, so pick up them.
 	want.SetName(got.GetName())
@@ -738,7 +738,7 @@ func Test_updateGroupNode(t *testing.T) {
 	}
 
 	g := NewWithT(t)
-	updateGroupNode(group, GetReadyV1Beta2Condition(group), obj, GetAvailableV1Beta2Condition(obj), GetReadyV1Beta2Condition(obj), GetMachineUpToDateV1Beta2Condition(obj))
+	updateGroupNode(group, GetReadyCondition(group), obj, GetAvailableCondition(obj), GetReadyCondition(obj), GetMachineUpToDateCondition(obj))
 
 	g.Expect(group).To(BeComparableTo(want))
 }
@@ -827,7 +827,7 @@ func Test_updateV1Beta1GroupNode(t *testing.T) {
 	}
 
 	g := NewWithT(t)
-	updateV1Beta1GroupNode(group, GetReadyCondition(group), obj, GetReadyCondition(obj))
+	updateV1Beta1GroupNode(group, GetV1Beta1ReadyCondition(group), obj, GetV1Beta1ReadyCondition(obj))
 
 	g.Expect(group).To(BeComparableTo(want))
 }

cmd/clusterctl/client/tree/util.go

@@ -35,8 +35,8 @@ import (
 // GroupVersionVirtualObject is the group version for VirtualObject.
 var GroupVersionVirtualObject = schema.GroupVersion{Group: "virtual.cluster.x-k8s.io", Version: clusterv1.GroupVersion.Version}
 
-// GetReadyV1Beta2Condition returns the ReadyCondition for an object, if defined.
-func GetReadyV1Beta2Condition(obj client.Object) *metav1.Condition {
+// GetReadyCondition returns the ReadyCondition for an object, if defined.
+func GetReadyCondition(obj client.Object) *metav1.Condition {
 	if getter, ok := obj.(conditions.Getter); ok {
 		return conditions.Get(getter, clusterv1.ReadyCondition)
 	}
@@ -52,8 +52,8 @@ func GetReadyV1Beta2Condition(obj client.Object) *metav1.Condition {
 	return nil
 }
 
-// GetAvailableV1Beta2Condition returns the AvailableCondition for an object, if defined.
-func GetAvailableV1Beta2Condition(obj client.Object) *metav1.Condition {
+// GetAvailableCondition returns the AvailableCondition for an object, if defined.
+func GetAvailableCondition(obj client.Object) *metav1.Condition {
 	if getter, ok := obj.(conditions.Getter); ok {
 		return conditions.Get(getter, clusterv1.AvailableCondition)
 	}
@@ -69,26 +69,26 @@ func GetAvailableV1Beta2Condition(obj client.Object) *metav1.Condition {
 	return nil
 }
 
-// GetMachineUpToDateV1Beta2Condition returns machine's UpToDate condition, if defined.
+// GetMachineUpToDateCondition returns machine's UpToDate condition, if defined.
 // Note: The UpToDate condition only exist on machines, so no need to support reading from unstructured.
-func GetMachineUpToDateV1Beta2Condition(obj client.Object) *metav1.Condition {
+func GetMachineUpToDateCondition(obj client.Object) *metav1.Condition {
 	if getter, ok := obj.(conditions.Getter); ok {
 		return conditions.Get(getter, clusterv1.MachineUpToDateCondition)
 	}
 	return nil
 }
 
-// GetReadyCondition returns the ReadyCondition for an object, if defined.
-func GetReadyCondition(obj client.Object) *clusterv1.Condition {
+// GetV1Beta1ReadyCondition returns the ReadyCondition for an object, if defined.
+func GetV1Beta1ReadyCondition(obj client.Object) *clusterv1.Condition {
 	getter := objToGetter(obj)
 	if getter == nil {
 		return nil
 	}
 	return v1beta1conditions.Get(getter, clusterv1.ReadyV1Beta1Condition)
 }
 
-// GetAllV1Beta2Conditions returns the other conditions (all the conditions except ready) for an object, if defined.
-func GetAllV1Beta2Conditions(obj client.Object) []metav1.Condition {
+// GetConditions returns conditions for an object, if defined.
+func GetConditions(obj client.Object) []metav1.Condition {
 	if getter, ok := obj.(conditions.Getter); ok {
 		return getter.GetConditions()
 	}
@@ -104,8 +104,8 @@ func GetAllV1Beta2Conditions(obj client.Object) []metav1.Condition {
 	return nil
 }
 
-// GetOtherConditions returns the other conditions (all the conditions except ready) for an object, if defined.
-func GetOtherConditions(obj client.Object) []*clusterv1.Condition {
+// GetOtherV1Beta1Conditions returns the other conditions (all the conditions except ready) for an object, if defined.
+func GetOtherV1Beta1Conditions(obj client.Object) []*clusterv1.Condition {
 	getter := objToGetter(obj)
 	if getter == nil {
 		return nil
@@ -122,19 +122,19 @@ func GetOtherConditions(obj client.Object) []*clusterv1.Condition {
 	return conditions
 }
 
-func setAvailableV1Beta2Condition(obj client.Object, available *metav1.Condition) {
+func setAvailableCondition(obj client.Object, available *metav1.Condition) {
 	if setter, ok := obj.(conditions.Setter); ok {
 		conditions.Set(setter, *available)
 	}
 }
 
-func setReadyV1Beta2Condition(obj client.Object, ready *metav1.Condition) {
+func setReadyCondition(obj client.Object, ready *metav1.Condition) {
 	if setter, ok := obj.(conditions.Setter); ok {
 		conditions.Set(setter, *ready)
 	}
 }
 
-func setUpToDateV1Beta2Condition(obj client.Object, upToDate *metav1.Condition) {
+func setUpToDateCondition(obj client.Object, upToDate *metav1.Condition) {
 	if setter, ok := obj.(conditions.Setter); ok {
 		conditions.Set(setter, *upToDate)
 	}