Add Helm keys to configure annotations for mesh deployment and pods

traefik · May 30, 2020 · f737a92 · f737a92
1 parent 04575e2
commit f737a92
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/helm/chart/maesh/templates/mesh/mesh-daemonset.yaml b/helm/chart/maesh/templates/mesh/mesh-daemonset.yaml
@@ -9,6 +9,10 @@ metadata:
     chart: {{ include "maesh.chartLabel" . | quote }}
     release: {{ .Release.Name | quote }}
     heritage: {{ .Release.Service | quote }}
+  {{- with .Values.mesh.annotations }}
+  annotations:
+{{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
   selector:
     matchLabels:
@@ -24,6 +28,9 @@ spec:
       annotations:
         prometheus.io/scrape: "true"
         prometheus.io/port: "8080"
+        {{- with .Values.mesh.podAnnotations }}
+{{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       serviceAccountName: maesh-mesh
       automountServiceAccountToken: true

diff --git a/helm/chart/maesh/values.yaml b/helm/chart/maesh/values.yaml
@@ -65,6 +65,12 @@ mesh:
   # Added so we can launch on nodes with restrictions
   nodeSelector: {}
   tolerations: []
+  # Additional deployment annotations
+  # (Optional)
+  # annotations: {}
+  # Additional pod annotations
+  # (Optional)
+  # podAnnotations: {}
 
 #
 # Tracing configuration