[stable/sysdig] fix setting env vars (#21106)

Signed-off-by: Brendan Germain <brendan.germain@nasdaq.com>
helm · Feb 28, 2020 · 00cc649 · 00cc649
1 parent 95e5479
commit 00cc649
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/stable/sysdig/CHANGELOG.md b/stable/sysdig/CHANGELOG.md
@@ -3,6 +3,12 @@
 This file documents all notable changes to Sysdig Helm Chart. The release
 numbering uses [semantic versioning](http://semver.org).
 
+## v1.7.3
+
+### Minor changes
+
+* Removed dependency on ebpf.enabled to set environment  variables
+
 ## v1.7.2
 
 ### Minor changes

diff --git a/stable/sysdig/Chart.yaml b/stable/sysdig/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: sysdig
-version: 1.7.2
+version: 1.7.3
 appVersion: 9.5.0
 description: Sysdig Monitor and Secure agent
 keywords:

diff --git a/stable/sysdig/templates/daemonset.yaml b/stable/sysdig/templates/daemonset.yaml
@@ -71,31 +71,31 @@ spec:
 {{ toYaml .Values.resources | indent 12 }}
           securityContext:
             privileged: true
-          {{- if .Values.ebpf.enabled }}
           env:
+            {{- if .Values.ebpf.enabled }}
             - name: SYSDIG_BPF_PROBE
               value:
-          {{- end }}
-          {{- if .Values.proxy.httpProxy }}
+            {{- end }}
+            {{- if .Values.proxy.httpProxy }}
             - name: http_proxy
               value: {{ .Values.proxy.httpProxy }}
-          {{- end }}
-          {{- if .Values.proxy.httpsProxy }}
+            {{- end }}
+            {{- if .Values.proxy.httpsProxy }}
             - name: https_proxy
               value: {{ .Values.proxy.httpsProxy }}
-          {{- end }}
-          {{- if .Values.proxy.noProxy }}
+            {{- end }}
+            {{- if .Values.proxy.noProxy }}
             - name: no_proxy
               value: {{ .Values.proxy.noProxy }}
-          {{- end }}
-          {{- if .Values.timezone }}
+            {{- end }}
+            {{- if .Values.timezone }}
             - name: TZ
               value: {{ .Values.timezone }}
-          {{- end }}
-          {{- range $key, $value := .Values.daemonset.env }}
+            {{- end }}
+            {{- range $key, $value := .Values.daemonset.env }}
             - name: "{{ $key }}"
               value: "{{ $value }}"
-          {{- end }}
+            {{- end }}
           readinessProbe:
             exec:
               command: [ "test", "-e", "/opt/draios/logs/running" ]

diff --git a/stable/sysdig/values.yaml b/stable/sysdig/values.yaml
@@ -92,7 +92,7 @@ sysdig:
   # Required: You need your Sysdig Monitor access key before running agents.
   accessKey: ""
 
-  settings:
+  settings: {}
     ### Agent tags
     # tags: linux:ubuntu,dept:dev,local:nyc
     #### Sysdig Software related config ####