fix: dont render launcher image if unset (global config), fix clabver…

…ter namespace in helm test
srl-labs · Jun 13, 2024 · 99069fd · 99069fd
1 parent b3609b4
commit 99069fd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/charts/clabernetes/templates/configmap.yaml b/charts/clabernetes/templates/configmap.yaml
@@ -44,7 +44,9 @@ data:
   {{- end }}
   inClusterDNSSuffix: {{ .Values.globalConfig.inClusterDNSSuffix }}
   imagePullThroughMode: {{ .Values.globalConfig.imagePull.imagePullThroughMode }}
+  {{- if .Values.globalConfig.deployment.launcherImage }}
   launcherImage: {{ .Values.globalConfig.deployment.launcherImage }}
+  {{- end }}
   launcherImagePullPolicy: {{ .Values.globalConfig.deployment.launcherImagePullPolicy }}
   launcherLogLevel: {{ .Values.globalConfig.deployment.launcherLogLevel }}
   {{- if .Values.globalConfig.imagePull.criSockOverride }}

diff --git a/charts/clabernetes/tests/clicker_enabled/test-fixtures/golden/configmap.yaml b/charts/clabernetes/tests/clicker_enabled/test-fixtures/golden/configmap.yaml
@@ -40,7 +40,6 @@ data:
   containerlabDebug: "false"
   inClusterDNSSuffix: svc.cluster.local
   imagePullThroughMode: auto
-  launcherImage: 
   launcherImagePullPolicy: IfNotPresent
   launcherLogLevel: info
   naming: prefixed
diff --git a/charts/clabernetes/tests/customized_values/test-fixtures/golden/configmap.yaml b/charts/clabernetes/tests/customized_values/test-fixtures/golden/configmap.yaml
@@ -33,7 +33,6 @@ data:
   containerlabDebug: "false"
   inClusterDNSSuffix: svc.cluster.local
   imagePullThroughMode: auto
-  launcherImage: 
   launcherImagePullPolicy: IfNotPresent
   launcherLogLevel: info
   naming: prefixed
diff --git a/charts/clabernetes/tests/default_values/test-fixtures/golden/configmap.yaml b/charts/clabernetes/tests/default_values/test-fixtures/golden/configmap.yaml
@@ -33,7 +33,6 @@ data:
   containerlabDebug: "false"
   inClusterDNSSuffix: svc.cluster.local
   imagePullThroughMode: auto
-  launcherImage: 
   launcherImagePullPolicy: IfNotPresent
   launcherLogLevel: info
   naming: prefixed
diff --git a/charts/clicker/tests/default_values/default_values_test.go b/charts/clicker/tests/default_values/default_values_test.go
@@ -1,6 +1,7 @@
 package default_values_test
 
 import (
+	clabernetesconstants "github.com/srl-labs/clabernetes/constants"
 	"os"
 	"path/filepath"
 	"testing"
@@ -30,5 +31,12 @@ func TestDefaultValues(t *testing.T) {
 
 	t.Log(chartsDir)
 
-	clabernetestesthelper.HelmTest(t, chartName, testName, "", "", chartsDir)
+	clabernetestesthelper.HelmTest(
+		t,
+		chartName,
+		testName,
+		clabernetesconstants.Clabernetes,
+		"",
+		chartsDir,
+	)
 }