Add namespace support to new watchers

stakater-charts · Jan 14, 2019 · fafe7ab · fafe7ab
1 parent 852d053
commit fafe7ab
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/grafana/templates/deployment.yaml b/grafana/templates/deployment.yaml
@@ -129,6 +129,10 @@ spec:
           value: "{{ .Values.grafana.datasources.watcher.label }}"
         - name: FOLDER
           value: "{{ .Values.grafana.datasources.watcher.folder }}"
+        {{- if .Values.grafana.datasources.watcher.namespace }}
+        - name: NAMESPACE
+          value: "{{ .Values.grafana.datasources.watcher.namespace }}"
+        {{- end }}
         {{- if .Values.grafana.deployment.configmapWatcher.resources }}
         resources:
           {{- toYaml .Values.grafana.deployment.configmapWatcher.resources | trim | nindent 10 -}}
@@ -146,6 +150,10 @@ spec:
           value: "{{ .Values.grafana.dashboards.watcher.label }}"
         - name: FOLDER
           value: "{{ .Values.grafana.dashboards.watcher.folder }}"
+        {{- if .Values.grafana.dashboards.watcher.namespace }}
+        - name: NAMESPACE
+          value: "{{ .Values.grafana.dashboards.watcher.namespace }}"
+        {{- end }}
         {{- if .Values.grafana.deployment.configmapWatcher.resources }}
         resources:
           {{- toYaml .Values.grafana.deployment.configmapWatcher.resources | trim | nindent 10 -}}

diff --git a/grafana/values.yaml b/grafana/values.yaml
@@ -63,9 +63,9 @@ grafana:
         tag: "0.0.6"
         pullPolicy:
       datasources:
-        enabled: false
+        enabled: true
       dashboards:
-        enabled: false
+        enabled: true
 
   # resources:
   #   requests:
@@ -109,7 +109,9 @@ grafana:
     watcher:
       folder: /tmp/datasources
       label: grafana.datasource.test
+      namespace:
   dashboards:
     watcher:
       folder: /tmp/dashboards
-      label: grafana.dashboard.test
+      label: grafana.dashboard.test
+      namespace: