From 9477ef31a02b6384f9db58ac8ff8026dd1be1aa5 Mon Sep 17 00:00:00 2001
From: Jorge Salamero Sanz <bencer@users.noreply.github.com>
Date: Thu, 5 Sep 2019 13:47:09 +0200
Subject: [PATCH] [stable/sysdig] Add configmaps, secrets access and more
 config settings (#16891)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [stable/sysdig] Add configmaps, secrets access and more config settings

Signed-off-by: Jorge Salamero Sanz <bencer@cauterized.net>

* [stable/sysdig] Ooops, forget to increase version in Chart.yaml

Signed-off-by: Néstor Salceda <nestor.salceda@sysdig.com>
---
 stable/sysdig/CHANGELOG.md               |  7 +++++++
 stable/sysdig/Chart.yaml                 |  2 +-
 stable/sysdig/templates/clusterrole.yaml |  2 ++
 stable/sysdig/templates/daemonset.yaml   | 23 +++++++++++++++++++++++
 stable/sysdig/values.yaml                | 14 ++++++++++++++
 5 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/stable/sysdig/CHANGELOG.md b/stable/sysdig/CHANGELOG.md
index 09f4adf939..df754ad8ce 100644
--- a/stable/sysdig/CHANGELOG.md
+++ b/stable/sysdig/CHANGELOG.md
@@ -3,6 +3,13 @@
 This file documents all notable changes to Sysdig Helm Chart. The release
 numbering uses [semantic versioning](http://semver.org).
 
+## v1.4.15
+
+### Minor changes
+
+* Add configmaps and secrets to the resources we can read
+* Add support for priorityClassName, httpProxy, timezone and any env variable settings
+
 ## v1.4.14
 
 ### Minor changes
diff --git a/stable/sysdig/Chart.yaml b/stable/sysdig/Chart.yaml
index 63ddc23891..d0c11de537 100755
--- a/stable/sysdig/Chart.yaml
+++ b/stable/sysdig/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: sysdig
-version: 1.4.14
+version: 1.4.15
 appVersion: 0.92.1
 description: Sysdig Monitor and Secure agent
 keywords:
diff --git a/stable/sysdig/templates/clusterrole.yaml b/stable/sysdig/templates/clusterrole.yaml
index a7e794b06f..542385c21c 100644
--- a/stable/sysdig/templates/clusterrole.yaml
+++ b/stable/sysdig/templates/clusterrole.yaml
@@ -22,6 +22,8 @@ rules:
       - resourcequotas
       - persistentvolumes
       - persistentvolumeclaims
+      - configmaps
+      - secrets
     verbs:
       - get
       - list
diff --git a/stable/sysdig/templates/daemonset.yaml b/stable/sysdig/templates/daemonset.yaml
index c78683f349..a576c287ae 100644
--- a/stable/sysdig/templates/daemonset.yaml
+++ b/stable/sysdig/templates/daemonset.yaml
@@ -17,6 +17,9 @@ spec:
         role: monitoring
     spec:
       serviceAccountName: {{ template "sysdig.serviceAccountName" .}}
+{{- if .Values.priorityClassName }}
+      priorityClassName: "{{ .Values.priorityClassName }}"
+{{- end }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 8 }}
       hostNetwork: true
@@ -40,6 +43,26 @@ spec:
             - name: SYSDIG_BPF_PROBE
               value:
           {{- end }}
+          {{- if .Values.proxy.httpProxy }}
+            - name: http_proxy
+              value: {{ .Values.proxy.httpProxy }}
+          {{- end }}
+          {{- if .Values.proxy.httpsProxy }}
+            - name: https_proxy
+              value: {{ .Values.proxy.httpsProxy }}
+          {{- end }}
+          {{- if .Values.proxy.noProxy }}
+            - name: no_proxy
+              value: {{ .Values.proxy.noProxy }}
+          {{- end }}
+          {{- if .Values.timezone }}
+            - name: TZ
+              value: {{ .Values.timezone }}
+          {{- end }}
+          {{- range $key, $value := .Values.daemonset.env }}
+            - name: "{{ $key }}"
+              value: "{{ $value }}"
+          {{- end }}
           readinessProbe:
             exec:
               command: [ "test", "-e", "/opt/draios/logs/running" ]
diff --git a/stable/sysdig/values.yaml b/stable/sysdig/values.yaml
index e3f0f67993..6d2155b604 100644
--- a/stable/sysdig/values.yaml
+++ b/stable/sysdig/values.yaml
@@ -43,6 +43,20 @@ daemonset:
     # You can also customize maxUnavailable, maxSurge or minReadySeconds if you
     # need it
     type: RollingUpdate
+  ## Extra environment variables that will be pass onto deployment pods
+  env: {}
+
+# If is behind a proxy you can set the proxy server
+proxy:
+  httpProxy:
+  httpsProxy:
+  noProxy:
+
+# Set daemonset timezone
+timezone:
+
+# Set daemonset priorityClassName
+priorityClassName:
 
 ebpf:
   # Enable eBPF support for Sysdig Agent