From a68d93cd2a2cbc1d98d070757133981862fbe64b Mon Sep 17 00:00:00 2001 From: Filipe Regadas Date: Fri, 25 Feb 2022 12:24:27 +0000 Subject: [PATCH] Propagate FlinkCluster global envVars (#296) --- controllers/flinkcluster/flinkcluster_converter.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/flinkcluster/flinkcluster_converter.go b/controllers/flinkcluster/flinkcluster_converter.go index df0824d7..1563ae49 100644 --- a/controllers/flinkcluster/flinkcluster_converter.go +++ b/controllers/flinkcluster/flinkcluster_converter.go @@ -183,7 +183,7 @@ func newJobManagerPodSpec(mainContainer *corev1.Container, flinkCluster *v1beta1 var jobManagerSpec = clusterSpec.JobManager var podSpec = &corev1.PodSpec{ - InitContainers: jobManagerSpec.InitContainers, + InitContainers: convertContainers(jobManagerSpec.InitContainers, []corev1.VolumeMount{}, clusterSpec.EnvVars), Containers: []corev1.Container{*mainContainer}, Volumes: jobManagerSpec.Volumes, NodeSelector: jobManagerSpec.NodeSelector, @@ -452,7 +452,7 @@ func newTaskManagerPodSpec(mainContainer *corev1.Container, flinkCluster *v1beta var taskManagerSpec = flinkCluster.Spec.TaskManager var podSpec = &corev1.PodSpec{ - InitContainers: taskManagerSpec.InitContainers, + InitContainers: convertContainers(taskManagerSpec.InitContainers, []corev1.VolumeMount{}, clusterSpec.EnvVars), Containers: []corev1.Container{*mainContainer}, Volumes: taskManagerSpec.Volumes, NodeSelector: taskManagerSpec.NodeSelector,