fix

spotify · Jun 23, 2021 · b89cfb9 · b89cfb9
1 parent 5f4f20a
commit b89cfb9
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/api/v1beta1/flinkcluster_types.go b/api/v1beta1/flinkcluster_types.go
@@ -428,7 +428,7 @@ type JobSpec struct {
 	SecurityContext *corev1.PodSecurityContext `json:"securityContext,omitempty"`
 
 	// Job running mode
-	Mode *JobMode `json:"mode"`
+	Mode *JobMode `json:"mode,omitempty"`
 }
 
 // FlinkClusterSpec defines the desired state of FlinkCluster

diff --git a/api/v1beta1/flinkcluster_validate.go b/api/v1beta1/flinkcluster_validate.go
@@ -537,6 +537,7 @@ func (v *Validator) validateCleanupAction(
 
 func (v *Validator) validateJobMode(property string, value JobMode) error {
 	switch value {
+	case JobModeBlocking:
 	case JobModeDetached:
 	default:
 		return fmt.Errorf("invalid %v: %v", property, value)

diff --git a/config/crd/bases/flinkoperator.k8s.io_flinkclusters.yaml b/config/crd/bases/flinkoperator.k8s.io_flinkclusters.yaml
@@ -724,6 +724,8 @@ spec:
                     type: array
                   jarFile:
                     type: string
+                  mode:
+                    type: string
                   noLoggingToStdout:
                     type: boolean
                   parallelism:

diff --git a/controllers/flinkcluster_converter.go b/controllers/flinkcluster_converter.go
@@ -692,9 +692,8 @@ func getDesiredJob(observed *ObservedClusterState) *batchv1.Job {
 
 	if jobSpec.Mode != nil {
 		switch *jobSpec.Mode {
+		case v1beta1.JobModeBlocking:
 		case v1beta1.JobModeDetached:
-			fallthrough
-		default:
 			jobArgs = append(jobArgs, "--detached")
 		}
 	}

diff --git a/controllers/flinkcluster_converter_test.go b/controllers/flinkcluster_converter_test.go
@@ -55,7 +55,7 @@ func TestGetDesiredClusterState(t *testing.T) {
 	var memoryOffHeapRatio int32 = 25
 	var memoryOffHeapMin = resource.MustParse("600M")
 	var memoryProcessRatio int32 = 80
-	var jobMode v1beta1.JobMode = v1beta1.JobModeDetached
+	var jobMode v1beta1.JobMode = v1beta1.JobModeBlocking
 	var jobBackoffLimit int32 = 0
 	var jmReadinessProbe = corev1.Probe{
 		Handler: corev1.Handler{

diff --git a/controllers/flinkcluster_util_test.go b/controllers/flinkcluster_util_test.go
@@ -139,10 +139,10 @@ func TestNewRevision(t *testing.T) {
 	var revision, _ = newRevision(&flinkCluster, 1, &collisionCount)
 	var expectedRevision = appsv1.ControllerRevision{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      "mycluster-6889b5645c",
+			Name:      "mycluster-7bc87c954f",
 			Namespace: "default",
 			Labels: map[string]string{
-				"flinkoperator.k8s.io/hash":       "6889b5645c",
+				"flinkoperator.k8s.io/hash":       "7bc87c954f",
 				"flinkoperator.k8s.io/managed-by": "mycluster",
 			},
 			Annotations: map[string]string{},