Merge pull request #4 from stakater-charts/add-namespace-support

Add namespace support to new watchers
stakater-charts · Jan 14, 2019 · db15b07 · db15b07
2 parents 852d053 + 78e2138
commit db15b07
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
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
@@ -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: