clusterctl: move Node's .status.v1beta2.conditions to .status.deprecated.conditions

Author: chrischdi

cmd/clusterctl/client/tree/node_object.go

@@ -37,11 +37,6 @@ type NodeObject struct {
 // NodeStatus is the status of a node object.
 type NodeStatus struct {
 	Deprecated *NodeDeprecatedStatus
-	V1Beta2    *NodeObjectV1Beta2Status
-}
-
-// NodeObjectV1Beta2Status is the v1Beta2 status of a node object.
-type NodeObjectV1Beta2Status struct {
 	Conditions []metav1.Condition
 }
 
@@ -77,18 +72,12 @@ func (o *NodeObject) SetV1Beta1Conditions(conditions clusterv1.Conditions) {
 
 // GetConditions returns the set of conditions for this object.
 func (o *NodeObject) GetConditions() []metav1.Condition {
-	if o.Status.V1Beta2 == nil {
-		return nil
-	}
-	return o.Status.V1Beta2.Conditions
+	return o.Status.Conditions
 }
 
 // SetConditions sets conditions for an API object.
 func (o *NodeObject) SetConditions(conditions []metav1.Condition) {
-	if o.Status.V1Beta2 == nil && conditions != nil {
-		o.Status.V1Beta2 = &NodeObjectV1Beta2Status{}
-	}
-	o.Status.V1Beta2.Conditions = conditions
+	o.Status.Conditions = conditions
 }
 
 // GetUID returns object's UID.

cmd/clusterctl/client/tree/tree_test.go

@@ -556,12 +556,10 @@ func Test_createGroupNode(t *testing.T) {
 			UID: types.UID(""), // random string
 		},
 		Status: NodeStatus{
-			V1Beta2: &NodeObjectV1Beta2Status{
-				Conditions: []metav1.Condition{
-					{Type: clusterv1.AvailableCondition, Status: metav1.ConditionTrue},
-					{Type: clusterv1.ReadyCondition, Status: metav1.ConditionTrue, LastTransitionTime: beforeNow},
-					{Type: clusterv1.MachineUpToDateCondition, Status: metav1.ConditionFalse},
-				},
+			Conditions: []metav1.Condition{
+				{Type: clusterv1.AvailableCondition, Status: metav1.ConditionTrue},
+				{Type: clusterv1.ReadyCondition, Status: metav1.ConditionTrue, LastTransitionTime: beforeNow},
+				{Type: clusterv1.MachineUpToDateCondition, Status: metav1.ConditionFalse},
 			},
 		},
 	}
@@ -572,11 +570,11 @@ func Test_createGroupNode(t *testing.T) {
 	// Some values are generated randomly, so pick up them.
 	want.SetName(got.GetName())
 	want.SetUID(got.GetUID())
-	for i := range got.Status.V1Beta2.Conditions {
-		if got.Status.V1Beta2.Conditions[i].Type == clusterv1.ReadyCondition {
+	for i := range got.Status.Conditions {
+		if got.Status.Conditions[i].Type == clusterv1.ReadyCondition {
 			continue
 		}
-		got.Status.V1Beta2.Conditions[i].LastTransitionTime = metav1.Time{}
+		got.Status.Conditions[i].LastTransitionTime = metav1.Time{}
 	}
 
 	g.Expect(got).To(BeComparableTo(want))
@@ -687,12 +685,10 @@ func Test_updateGroupNode(t *testing.T) {
 			UID: types.UID(""), // random string
 		},
 		Status: NodeStatus{
-			V1Beta2: &NodeObjectV1Beta2Status{
-				Conditions: []metav1.Condition{
-					{Type: clusterv1.AvailableCondition, Status: metav1.ConditionTrue},
-					{Type: clusterv1.ReadyCondition, LastTransitionTime: beforeNow},
-					{Type: clusterv1.MachineUpToDateCondition, Status: metav1.ConditionFalse},
-				},
+			Conditions: []metav1.Condition{
+				{Type: clusterv1.AvailableCondition, Status: metav1.ConditionTrue},
+				{Type: clusterv1.ReadyCondition, LastTransitionTime: beforeNow},
+				{Type: clusterv1.MachineUpToDateCondition, Status: metav1.ConditionFalse},
 			},
 		},
 	}
@@ -733,12 +729,10 @@ func Test_updateGroupNode(t *testing.T) {
 			UID: types.UID(""), // random string
 		},
 		Status: NodeStatus{
-			V1Beta2: &NodeObjectV1Beta2Status{
-				Conditions: []metav1.Condition{
-					{Type: clusterv1.AvailableCondition, Status: metav1.ConditionTrue},
-					{Type: clusterv1.ReadyCondition, LastTransitionTime: beforeNow},
-					{Type: clusterv1.MachineUpToDateCondition, Status: metav1.ConditionFalse},
-				},
+			Conditions: []metav1.Condition{
+				{Type: clusterv1.AvailableCondition, Status: metav1.ConditionTrue},
+				{Type: clusterv1.ReadyCondition, LastTransitionTime: beforeNow},
+				{Type: clusterv1.MachineUpToDateCondition, Status: metav1.ConditionFalse},
 			},
 		},
 	}