fix daemonset generation if datadog.securityContext==nil (helm#23146)

If the `datadog.securityContext` value is set to `nil` instead of `{}` when a user want to remove the default `securityContext`, helm is not able to generate the Daemonset manifest. To support this configuration we have change how we test the value. With the new `{{ if ...}}` check we don't check the second comparison if the first already return false. Signed-off-by: cedric lamoriniere <[email protected]> Signed-off-by: Adrien Loiseau <[email protected]>
li-adrienloiseau · Jul 29, 2020 · f74a5a0 · f74a5a0
1 parent 79841ac
commit f74a5a0
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/stable/datadog/CHANGELOG.md b/stable/datadog/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Datadog changelog
 
+## 2.3.28
+
+* fix daemonset template generation if `datadog.securityContext` is set to `nil`
+
 ## 2.3.27
 
 * add systemProbe.collectDNSStats option

diff --git a/stable/datadog/Chart.yaml b/stable/datadog/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: datadog
-version: 2.3.27
+version: 2.3.28
 appVersion: "7"
 description: Datadog Agent
 keywords:

diff --git a/stable/datadog/ci/securitycontext-nil.yaml b/stable/datadog/ci/securitycontext-nil.yaml
@@ -0,0 +1,6 @@
+# Test the support of `securitContext` set to `nil`
+datadog:
+  apiKey: "00000000000000000000000000000000"
+  appKey: "0000000000000000000000000000000000000000"
+
+  securityContext:
diff --git a/stable/datadog/templates/daemonset.yaml b/stable/datadog/templates/daemonset.yaml
@@ -41,7 +41,7 @@ spec:
 {{ toYaml .Values.agents.podAnnotations | indent 8 }}
       {{- end }}
     spec:
-      {{- if and .Values.datadog.securityContext .Values.datadog.securityContext.seLinuxOptions }}
+      {{- if (.Values.datadog.securityContext) and .Values.datadog.securityContext.seLinuxOptions }}
       securityContext:
         seLinuxOptions:
 {{ toYaml .Values.datadog.securityContext.seLinuxOptions | indent 10 }}