test cleanups

Azure · Sep 3, 2024 · 3e60b08 · 3e60b08
1 parent cf1caf8
commit 3e60b08
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 41 deletions.
diff --git a/pkg/operator/controllers/dnsmasq/cluster_controller_test.go b/pkg/operator/controllers/dnsmasq/cluster_controller_test.go
@@ -273,24 +273,14 @@ func TestClusterReconciler(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "version",
 					},
-					Spec: configv1.ClusterVersionSpec{
-						DesiredUpdate: &configv1.Update{
-							Version: "4.10.12",
-						},
-					},
+					Spec: configv1.ClusterVersionSpec{},
 					Status: configv1.ClusterVersionStatus{
 						Conditions: []configv1.ClusterOperatorStatusCondition{
 							{
 								Type:   configv1.OperatorProgressing,
 								Status: configv1.ConditionTrue,
 							},
 						},
-						History: []configv1.UpdateHistory{
-							{
-								State:   configv1.CompletedUpdate,
-								Version: "4.10.11",
-							},
-						},
 					},
 				},
 			},
@@ -325,16 +315,12 @@ func TestClusterReconciler(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "version",
 					},
-					Spec: configv1.ClusterVersionSpec{
-						DesiredUpdate: &configv1.Update{
-							Version: "4.10.12",
-						},
-					},
+					Spec: configv1.ClusterVersionSpec{},
 					Status: configv1.ClusterVersionStatus{
-						History: []configv1.UpdateHistory{
+						Conditions: []configv1.ClusterOperatorStatusCondition{
 							{
-								State:   configv1.CompletedUpdate,
-								Version: "4.10.11",
+								Type:   configv1.OperatorProgressing,
+								Status: configv1.ConditionTrue,
 							},
 						},
 					},

diff --git a/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go b/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go
@@ -489,24 +489,14 @@ func TestMachineConfigReconcilerClusterUpgrading(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "version",
 					},
-					Spec: configv1.ClusterVersionSpec{
-						DesiredUpdate: &configv1.Update{
-							Version: "4.10.12",
-						},
-					},
+					Spec: configv1.ClusterVersionSpec{},
 					Status: configv1.ClusterVersionStatus{
 						Conditions: []configv1.ClusterOperatorStatusCondition{
 							{
 								Type:   configv1.OperatorProgressing,
 								Status: configv1.ConditionTrue,
 							},
 						},
-						History: []configv1.UpdateHistory{
-							{
-								State:   configv1.CompletedUpdate,
-								Version: "4.10.11",
-							},
-						},
 					},
 				}).
 				Build())

diff --git a/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go b/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go
@@ -511,24 +511,14 @@ func TestMachineConfigPoolReconcilerClusterUpgrading(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name: "version",
 					},
-					Spec: configv1.ClusterVersionSpec{
-						DesiredUpdate: &configv1.Update{
-							Version: "4.10.12",
-						},
-					},
+					Spec: configv1.ClusterVersionSpec{},
 					Status: configv1.ClusterVersionStatus{
 						Conditions: []configv1.ClusterOperatorStatusCondition{
 							{
 								Type:   configv1.OperatorProgressing,
 								Status: configv1.ConditionTrue,
 							},
 						},
-						History: []configv1.UpdateHistory{
-							{
-								State:   configv1.CompletedUpdate,
-								Version: "4.10.11",
-							},
-						},
 					},
 				}).
 				Build())