From 7761955229c73fc680c5db47bc3c14a0a25dc6ca Mon Sep 17 00:00:00 2001 From: Ivan Milchev Date: Fri, 14 Jun 2024 10:57:25 +0300 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20allow=20setting=20env=20for=20no?= =?UTF-8?q?de=20scan=20deployments=20(#1129)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ivan Milchev --- controllers/nodes/resources.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/nodes/resources.go b/controllers/nodes/resources.go index a6a745be..4eb2da7b 100644 --- a/controllers/nodes/resources.go +++ b/controllers/nodes/resources.go @@ -252,7 +252,7 @@ func UpdateDeployment( MountPath: "/tmp", }, }, - Env: []corev1.EnvVar{ + Env: k8s.MergeEnv([]corev1.EnvVar{ { Name: "DEBUG", Value: "false", @@ -265,7 +265,7 @@ func UpdateDeployment( Name: "MONDOO_AUTO_UPDATE", Value: "false", }, - }, + }, m.Spec.Nodes.Env), }, } dep.Spec.Template.Spec.Volumes = []corev1.Volume{