pkg/controller: Update openshift-related tests after bumping o/api dependency

Signed-off-by: timflannagan <[email protected]>

Author: timflannagan

pkg/controller/operators/openshift/clusteroperator_controller_test.go

@@ -64,7 +64,7 @@ var _ = Describe("ClusterOperator controller", func() {
 		}).Should(Succeed())
 
 		cv.Status = configv1.ClusterVersionStatus{
-			Desired: configv1.Update{
+			Desired: configv1.Release{
 				Version: clusterVersion,
 			},
 		}
@@ -161,7 +161,7 @@ var _ = Describe("ClusterOperator controller", func() {
 		}))
 
 		cv.Status = configv1.ClusterVersionStatus{
-			Desired: configv1.Update{
+			Desired: configv1.Release{
 				Version: clusterVersion,
 			},
 		}

pkg/controller/operators/openshift/helpers_test.go

@@ -232,7 +232,7 @@ func TestIncompatibleOperators(t *testing.T) {
 					Name: "version",
 				},
 				Status: configv1.ClusterVersionStatus{
-					Desired: configv1.Update{
+					Desired: configv1.Release{
 						Version: "1.0.0",
 					},
 				},
@@ -266,7 +266,7 @@ func TestIncompatibleOperators(t *testing.T) {
 					Name: "version",
 				},
 				Status: configv1.ClusterVersionStatus{
-					Desired: configv1.Update{
+					Desired: configv1.Release{
 						Version: "1.0.0",
 					},
 				},
@@ -336,7 +336,7 @@ func TestIncompatibleOperators(t *testing.T) {
 					Name: "version",
 				},
 				Status: configv1.ClusterVersionStatus{
-					Desired: configv1.Update{
+					Desired: configv1.Release{
 						Version: "1.0.0",
 					},
 				},
@@ -381,7 +381,7 @@ func TestIncompatibleOperators(t *testing.T) {
 					Name: "version",
 				},
 				Status: configv1.ClusterVersionStatus{
-					Desired: configv1.Update{
+					Desired: configv1.Release{
 						Version: "1.0.0",
 					},
 				},
@@ -429,7 +429,7 @@ func TestIncompatibleOperators(t *testing.T) {
 					Name: "version",
 				},
 				Status: configv1.ClusterVersionStatus{
-					Desired: configv1.Update{
+					Desired: configv1.Release{
 						Version: "", // This should result in an transient error
 					},
 				},
@@ -458,7 +458,7 @@ func TestIncompatibleOperators(t *testing.T) {
 					Name: "version",
 				},
 				Status: configv1.ClusterVersionStatus{
-					Desired: configv1.Update{
+					Desired: configv1.Release{
 						Version: "1.0.1", // Next Y-stream is 1.1.0, NOT 1.1.1
 					},
 				},
@@ -482,7 +482,7 @@ func TestIncompatibleOperators(t *testing.T) {
 					Name: "version",
 				},
 				Status: configv1.ClusterVersionStatus{
-					Desired: configv1.Update{
+					Desired: configv1.Release{
 						Version: "1.1.0-pre", // Next Y-stream is 1.1.0, NOT 1.2.0
 					},
 				},