Deprecate unused TM resource limit env vars (#483)

spotify · Oct 7, 2022 · 1dcdbb3 · 1dcdbb3
1 parent f48fa04
commit 1dcdbb3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 66 deletions.
diff --git a/controllers/flinkcluster/flinkcluster_converter.go b/controllers/flinkcluster/flinkcluster_converter.go
@@ -425,31 +425,6 @@ func newTaskManagerContainer(flinkCluster *v1beta1.FlinkCluster) *corev1.Contain
 		ports = append(ports, corev1.ContainerPort{Name: port.Name, ContainerPort: port.ContainerPort, Protocol: corev1.Protocol(port.Protocol)})
 	}
 
-	var envVars = []corev1.EnvVar{
-		{
-			Name: "TASK_MANAGER_CPU_LIMIT",
-			ValueFrom: &corev1.EnvVarSource{
-				ResourceFieldRef: &corev1.ResourceFieldSelector{
-					ContainerName: "taskmanager",
-					Resource:      "limits.cpu",
-					Divisor:       resource.MustParse("1m"),
-				},
-			},
-		},
-		{
-			Name: "TASK_MANAGER_MEMORY_LIMIT",
-			ValueFrom: &corev1.EnvVarSource{
-				ResourceFieldRef: &corev1.ResourceFieldSelector{
-					ContainerName: "taskmanager",
-					Resource:      "limits.memory",
-					Divisor:       resource.MustParse("1Mi"),
-				},
-			},
-		},
-	}
-
-	envVars = append(envVars, flinkCluster.Spec.EnvVars...)
-
 	return &corev1.Container{
 		Name:            "taskmanager",
 		Image:           imageSpec.Name,
@@ -459,7 +434,7 @@ func newTaskManagerContainer(flinkCluster *v1beta1.FlinkCluster) *corev1.Contain
 		LivenessProbe:   taskManagerSpec.LivenessProbe,
 		ReadinessProbe:  taskManagerSpec.ReadinessProbe,
 		Resources:       taskManagerSpec.Resources,
-		Env:             envVars,
+		Env:             flinkCluster.Spec.EnvVars,
 		EnvFrom:         flinkCluster.Spec.EnvFrom,
 		VolumeMounts:    taskManagerSpec.VolumeMounts,
 		Lifecycle: &corev1.Lifecycle{

diff --git a/controllers/flinkcluster/flinkcluster_converter_test.go b/controllers/flinkcluster/flinkcluster_converter_test.go
@@ -689,26 +689,6 @@ func TestGetDesiredClusterState(t *testing.T) {
 							LivenessProbe:  &tmLivenessProbe,
 							ReadinessProbe: &tmReadinessProbe,
 							Env: []corev1.EnvVar{
-								{
-									Name: "TASK_MANAGER_CPU_LIMIT",
-									ValueFrom: &corev1.EnvVarSource{
-										ResourceFieldRef: &corev1.ResourceFieldSelector{
-											ContainerName: "taskmanager",
-											Resource:      "limits.cpu",
-											Divisor:       resource.MustParse("1m"),
-										},
-									},
-								},
-								{
-									Name: "TASK_MANAGER_MEMORY_LIMIT",
-									ValueFrom: &corev1.EnvVarSource{
-										ResourceFieldRef: &corev1.ResourceFieldSelector{
-											ContainerName: "taskmanager",
-											Resource:      "limits.memory",
-											Divisor:       resource.MustParse("1Mi"),
-										},
-									},
-								},
 								{
 									Name:  "FOO",
 									Value: "abc",
@@ -1110,26 +1090,6 @@ func TestTmDeploymentTypeDeployment(t *testing.T) {
 							LivenessProbe:  &tmLivenessProbe,
 							ReadinessProbe: &tmReadinessProbe,
 							Env: []corev1.EnvVar{
-								{
-									Name: "TASK_MANAGER_CPU_LIMIT",
-									ValueFrom: &corev1.EnvVarSource{
-										ResourceFieldRef: &corev1.ResourceFieldSelector{
-											ContainerName: "taskmanager",
-											Resource:      "limits.cpu",
-											Divisor:       resource.MustParse("1m"),
-										},
-									},
-								},
-								{
-									Name: "TASK_MANAGER_MEMORY_LIMIT",
-									ValueFrom: &corev1.EnvVarSource{
-										ResourceFieldRef: &corev1.ResourceFieldSelector{
-											ContainerName: "taskmanager",
-											Resource:      "limits.memory",
-											Divisor:       resource.MustParse("1Mi"),
-										},
-									},
-								},
 								{
 									Name:  "FOO",
 									Value: "abc",