Added volumes, volumeMounts and additional labels to the chart (#251)

Author: RezaTehraniAPT

charts/metrics-agent/Chart.yaml

@@ -14,8 +14,8 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.11.22
+version: 2.11.23
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
-appVersion: 2.11.22
+appVersion: 2.11.23

charts/metrics-agent/templates/_helpers.tpl

@@ -41,6 +41,9 @@ helm.sh/chart: {{ include "metrics-agent.chart" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- if .Values.additionalLabels }}
+{{ toYaml .Values.additionalLabels }}
+{{- end }}
 {{- end -}}
 
 {{/*

charts/metrics-agent/templates/deployment.yaml

@@ -12,7 +12,8 @@ spec:
   template:
     metadata:
       labels:
-        {{- include "metrics-agent.selectorLabels" . | nindent 8 }}
+        {{- include "metrics-agent.labels" . | nindent 8 }}
+        {{- if .Values.podLabels }}{{ toYaml .Values.podLabels | nindent 8 }}{{- end }}
     spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -52,6 +53,14 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
+          {{- with .Values.volumeMounts }}
+          volumeMounts:
+          {{- toYaml . | nindent 12 }}
+          {{- end }}
+      {{- with .Values.volumes }}
+      volumes:
+      {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/metrics-agent/values.yaml

@@ -24,7 +24,7 @@ pollInterval: 180
 
 image:
   name: cloudability/metrics-agent
-  tag: 2.11.22
+  tag: 2.11.23
   pullPolicy: Always
 
 imagePullSecrets: []
@@ -73,5 +73,22 @@ openShift: false
 seccompProfile:
   type: RuntimeDefault
 
+volumes: []
+# - name: foo
+#   secret:
+#     secretName: mysecret
+#     optional: false
+
+volumeMounts: []
+# - name: foo
+#   mountPath: "/etc/foo"
+#   readOnly: true
+
+# Extra labels to add to the pod only.
+podLabels: {}
+
+# Extra labels to add to all resources, including pods.
+additionalLabels: {}
+
 drop: 
 - ALL

version/version.go

@@ -1,4 +1,4 @@
 package version
 
 // VERSION is the current version of the agent
-var VERSION = "2.11.22"
+var VERSION = "2.11.23"