Revert resource requests change (#242)

spotify · Dec 2, 2022 · 28f6be2 · 28f6be2
1 parent 4252ffd
commit 28f6be2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 22 deletions.
diff --git a/pkg/flink/config_test.go b/pkg/flink/config_test.go
@@ -33,7 +33,7 @@ func TestLoadConfig(t *testing.T) {
 		defaultCluster := flinkConfig.DefaultFlinkCluster.Spec
 		jm := defaultCluster.JobManager
 		tm := defaultCluster.TaskManager
-		assert.Equal(t, tm.Resources.Requests[corev1.ResourceCPU], resource.MustParse("4"))
+		assert.Equal(t, tm.Resources.Limits[corev1.ResourceCPU], resource.MustParse("4"))
 		assert.Equal(t, jm.Resources.Limits[corev1.ResourceMemory], resource.MustParse("4Gi"))
 		assert.Equal(t, tm.Resources.Limits[corev1.ResourceMemory], resource.MustParse("4Gi"))
 	})
@@ -43,7 +43,7 @@ func TestLoadConfig(t *testing.T) {
 		jm := defaultCluster.JobManager
 		tm := defaultCluster.TaskManager
 		assert.Equal(t, *tm.Replicas, int32(4))
-		assert.Equal(t, jm.Resources.Requests[corev1.ResourceCPU], resource.MustParse("3.5"))
+		assert.Equal(t, jm.Resources.Limits[corev1.ResourceCPU], resource.MustParse("3.5"))
 		assert.Equal(t, *flinkConfig.DefaultFlinkCluster.Spec.ServiceAccountName, "flink-service-account")
 		assert.Equal(t, *flinkConfig.GeneratedNameMaxLength, 50)
 	})

diff --git a/pkg/flink/constants.go b/pkg/flink/constants.go
@@ -39,28 +39,30 @@ const (
 )
 
 var (
-	regexpFlinkClusterName      = regexp.MustCompile(`^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$`)
-	generatedNameMaxLength      = 50
-	nonRetryableExitCodes       = []int32{}
-	defaultServiceAccount       = "default"
-	defaultResourceRequirements = corev1.ResourceRequirements{
-		Limits: map[corev1.ResourceName]resource.Quantity{
-			corev1.ResourceMemory: resource.MustParse("4Gi"),
-		},
-		Requests: map[corev1.ResourceName]resource.Quantity{
-			corev1.ResourceCPU: resource.MustParse("4"),
-		},
-	}
-	defaultConfig = Config{
+	regexpFlinkClusterName = regexp.MustCompile(`^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$`)
+	generatedNameMaxLength = 50
+	nonRetryableExitCodes  = []int32{}
+	defaultServiceAccount  = "default"
+	defaultConfig          = Config{
 		DefaultFlinkCluster: flinkOp.FlinkCluster{
 			Spec: flinkOp.FlinkClusterSpec{
 				ServiceAccountName: &defaultServiceAccount,
 				JobManager: &flinkOp.JobManagerSpec{
-					Resources: defaultResourceRequirements,
+					Resources: corev1.ResourceRequirements{
+						Limits: map[corev1.ResourceName]resource.Quantity{
+							corev1.ResourceCPU:    resource.MustParse("4"),
+							corev1.ResourceMemory: resource.MustParse("4Gi"),
+						},
+					},
 				},
 				TaskManager: &flinkOp.TaskManagerSpec{
-					Replicas:  pointer.Int32(1),
-					Resources: defaultResourceRequirements,
+					Replicas: pointer.Int32(1),
+					Resources: corev1.ResourceRequirements{
+						Limits: map[corev1.ResourceName]resource.Quantity{
+							corev1.ResourceCPU:    resource.MustParse("4"),
+							corev1.ResourceMemory: resource.MustParse("4Gi"),
+						},
+					},
 				},
 			},
 		},

diff --git a/pkg/flink/resources.go b/pkg/flink/resources.go
@@ -153,7 +153,7 @@ func (fc *FlinkCluster) updateJobManagerSpec(taskCtx FlinkTaskContext) {
 
 	if cpu := jm.GetResource().GetCpu(); cpu != nil {
 		if quantity := resource.MustParse(cpu.GetString_()); !quantity.IsZero() {
-			out.Resources.Requests[corev1.ResourceCPU] = quantity
+			out.Resources.Limits[corev1.ResourceCPU] = quantity
 		}
 	}
 
@@ -188,7 +188,7 @@ func (fc *FlinkCluster) updateTaskManagerSpec(taskCtx FlinkTaskContext) {
 
 	if cpu := tm.GetResource().GetCpu(); cpu != nil {
 		if quantity := resource.MustParse(cpu.GetString_()); !quantity.IsZero() {
-			out.Resources.Requests[corev1.ResourceCPU] = quantity
+			out.Resources.Limits[corev1.ResourceCPU] = quantity
 		}
 	}
 

diff --git a/pkg/flink/testdata/config.yaml b/pkg/flink/testdata/config.yaml
@@ -38,15 +38,15 @@ plugins:
                   gsutil -m cp {{join .Artifacts " "}} lib &&
                   zip -r job.jar .
               resources:
-                requests:
+                limits:
                   cpu: "2"
                   memory: "1Gi"
         jobManager:
           accessScope: External
           ingress:
             useTls: true
           resources:
-            requests:
+            limits:
               cpu: "3.5"
               memory: "4Gi"
           volumes: