Fixed failing tests and release-manifests

spotify · Jun 1, 2022 · 9fef96b · 9fef96b
1 parent aad80e7
commit 9fef96b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/config/crd/bases/flinkoperator.k8s.io_flinkclusters.yaml b/config/crd/bases/flinkoperator.k8s.io_flinkclusters.yaml
@@ -3932,6 +3932,8 @@ spec:
                   type: string
                 taskManager:
                   properties:
+                    deploymentType:
+                      type: string
                     extraPorts:
                       items:
                         properties:
@@ -5324,8 +5326,6 @@ spec:
                           - name
                         type: object
                       type: array
-                    storageType:
-                      type: string
                     tolerations:
                       items:
                         properties:

diff --git a/controllers/flinkcluster/flinkcluster_updater.go b/controllers/flinkcluster/flinkcluster_updater.go
@@ -375,7 +375,7 @@ func (updater *ClusterStatusUpdater) deriveClusterStatus(
 	var observedTmState runtime.Object
 	var tmStatusName string
 	var tmStatusState string
-	if observed.cluster.Spec.TaskManager.DeploymentType == v1beta1.DeploymentTypeStatefulset {
+	if cluster.Spec.TaskManager.DeploymentType == v1beta1.DeploymentTypeStatefulset {
 		observedTmStatefulSet := observed.tmStatefulSet
 		observedTmState = observedTmStatefulSet
 		tmStatusName = observedTmStatefulSet.Name

diff --git a/controllers/flinkcluster/flinkcluster_updater_test.go b/controllers/flinkcluster/flinkcluster_updater_test.go
@@ -209,7 +209,7 @@ func TestClusterStatus(t *testing.T) {
 		}
 
 		var updater = &ClusterStatusUpdater{log: log.Log, observed: observed}
-		cluster := v1beta1.FlinkCluster{Status: oldStatus}
+		cluster := v1beta1.FlinkCluster{Status: oldStatus, Spec: v1beta1.FlinkClusterSpec{TaskManager: &v1beta1.TaskManagerSpec{DeploymentType: v1beta1.DeploymentTypeStatefulset}}}
 		newStatus := updater.deriveClusterStatus(&cluster, &observed)
 		assert.Assert(t, updater.isStatusChanged(oldStatus, newStatus))
 		assert.Equal(t, newStatus.State, v1beta1.ClusterStateRunning)