Make Ignorenamespaces better manageable

traefik · Sep 25, 2019 · 74a1946 · 74a1946
1 parent 8e2f1dd
commit 74a1946
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/helm/chart/maesh/templates/_helpers.tpl b/helm/chart/maesh/templates/_helpers.tpl
@@ -7,10 +7,19 @@ Define the Chart version Label
 {{- define "maesh.chartLabel" -}}
     {{- printf "%s-%s" .Chart.Name .Chart.Version -}}
 {{- end -}}
-
 {{/*
 Define the templated image with tag
 */}}
 {{- define "maesh.controllerImage" -}}
     {{- printf "%s:%s" .Values.controller.image.name ( .Values.controller.image.tag | default .Chart.AppVersion ) -}}
 {{- end -}}
+{{/*
+Define the ignoreNamespaces List
+*/}}
+{{- define "maesh.controllerIgnoreNamespaces" -}}
+    --ignoreNamespaces=
+    {{- range $idx, $ns := .Values.controller.ignoreNamespaces }}
+        {{- if $idx }},{{ end }}
+            {{- $ns }}
+    {{- end -}}
+{{- end -}}
diff --git a/helm/chart/maesh/templates/controller/controller-deployment.yaml b/helm/chart/maesh/templates/controller/controller-deployment.yaml
@@ -73,7 +73,9 @@ spec:
             - "--smi"
             {{- end }}
             - "--namespace=$(POD_NAMESPACE)"
-            - "--ignorenamespaces={{- .Values.controller.ignoreNamespaces }}"
+            {{- if .Values.controller.ignoreNamespaces }}
+            - {{ include "maesh.controllerIgnoreNamespaces" . | quote }}
+            {{- end }}
           env:
             - name: POD_IP
               valueFrom: