diff --git a/pkg/operator/controllers/dnsmasq/cluster_controller_test.go b/pkg/operator/controllers/dnsmasq/cluster_controller_test.go index 09b5a718dd0..f7cb499dc13 100644 --- a/pkg/operator/controllers/dnsmasq/cluster_controller_test.go +++ b/pkg/operator/controllers/dnsmasq/cluster_controller_test.go @@ -273,11 +273,7 @@ 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{ { @@ -285,12 +281,6 @@ func TestClusterReconciler(t *testing.T) { 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 index 34d8b355b2d..266957c2b0a 100644 --- a/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go +++ b/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go @@ -489,11 +489,7 @@ 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{ { @@ -501,12 +497,6 @@ func TestMachineConfigReconcilerClusterUpgrading(t *testing.T) { 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 index 501c68fc3fb..8c84dc1214d 100644 --- a/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go +++ b/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go @@ -511,11 +511,7 @@ 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{ { @@ -523,12 +519,6 @@ func TestMachineConfigPoolReconcilerClusterUpgrading(t *testing.T) { Status: configv1.ConditionTrue, }, }, - History: []configv1.UpdateHistory{ - { - State: configv1.CompletedUpdate, - Version: "4.10.11", - }, - }, }, }). Build())