Support env, envFrom and additional args for mesh proxies in Helm chart

traefik · Jun 10, 2020 · 7b2daca · 7b2daca
1 parent 27c229e
commit 7b2daca
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 9 deletions.
diff --git a/helm/chart/maesh/templates/mesh/mesh-daemonset.yaml b/helm/chart/maesh/templates/mesh/mesh-daemonset.yaml
@@ -70,6 +70,14 @@ spec:
         - name: maesh-mesh
           image: {{ include "maesh.image" . | quote }}
           imagePullPolicy: {{ .Values.image.pullPolicy | default "IfNotPresent" }}
+          {{- with .Values.mesh.env }}
+          env:
+{{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.mesh.envFrom }}
+          envFrom:
+{{- toYaml . | nindent 12 }}
+          {{- end }}
           args:
             - "proxy"
             - "--entryPoints.readiness.address=:1081"
@@ -249,6 +257,11 @@ spec:
             - "--metrics.statsd.pushInterval={{ .Values.metrics.statsd.pushInterval }}"
               {{- end }}
             {{- end }}
+            {{- with .Values.mesh.additionalArguments }}
+            {{- range . }}
+            - {{ . | quote }}
+            {{- end }}
+            {{- end }}
           ports:
             - name: readiness
               containerPort: 1081

diff --git a/helm/chart/maesh/values.yaml b/helm/chart/maesh/values.yaml
@@ -1,4 +1,4 @@
-## Default values for maesh
+# Default values for Maesh.
 image:
   name: containous/maesh
   # (Optional)
@@ -27,6 +27,7 @@ limits:
 controller:
   # logLevel: error
   # logFormat: common
+
   # ignoreNamespaces:
   #  - example
 
@@ -38,25 +39,39 @@ controller:
       mem: 50Mi
       cpu: 100m
 
-  # Added so we can launch on nodes with restrictions
+  # Added so we can launch on nodes with restrictions.
   nodeSelector: {}
   tolerations: []
   affinity: {}
 
 mesh:
   # (Deprecated)
   # defaultMode: http
+
   # logLevel: error
   # logFormat: common
+
   # pollInterval: 1s
   # pollTimeout: 1s
+
   # forwardingTimeouts:
   #   dialTimeout: 30s
   #   (Optional)
   #   responseHeaderTimeout: 0s
   #   (Optional)
   #   idleConnTimeout: 1s
 
+  # env:
+  #   - name: NAME
+  #     value: "value"
+
+  # envFrom:
+  #   - configMapRef:
+  #       name: config
+
+  # additionalArguments:
+  #   - "--name=value"
+
   resources:
     limit:
       mem: 100Mi
@@ -65,18 +80,18 @@ mesh:
       mem: 50Mi
       cpu: 100m
 
-  # Added so we can launch on nodes with restrictions
+  # Added so we can launch on nodes with restrictions.
   nodeSelector: {}
   tolerations: []
-  # Additional deployment annotations
-  # (Optional)
+
+  # Additional deployment annotations.
   # annotations: {}
-  # Additional pod annotations
-  # (Optional)
+
+  # Additional pod annotations.
   # podAnnotations: {}
 
 #
-# Tracing configuration
+# Tracing configuration.
 #
 tracing:
   deploy: true
@@ -121,7 +136,7 @@ tracing:
     # baggagePrefixHeaderName: "sample"
 
 #
-# Metrics configuration
+# Metrics configuration.
 #
 metrics:
   deploy: true