add extravolumes(/mounts) to helm chart

add extravolumes(/mounts) to helm chart

Signed-off-by: zvlb <vl.zemtsov@gmail.com>

Author: zvlb

helm/charts/envoy-xds-controller/Chart.yaml

@@ -15,7 +15,7 @@ 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.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: "0.72"
+version: "0.73"
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

helm/charts/envoy-xds-controller/templates/_helpers.tpl

@@ -74,4 +74,41 @@ Create the name of the service account to use
 {{- else -}}
     {{ default "default" .Values.serviceAccount.name }}
 {{- end -}}
+{{- end -}}
+
+{{/*
+Generate volumeMounts
+*/}}
+{{- define "chart.volumeMounts" -}}
+{{- $mounts := list -}}
+{{- if .Values.webhook.enabled -}}
+{{- $mounts = append $mounts (dict "name" "cert" "mountPath" "/tmp/k8s-webhook-server/serving-certs" "readOnly" true) -}}
+{{- end -}}
+{{- if .Values.extraVolumeMounts -}}
+{{- $mounts = concat $mounts .Values.extraVolumeMounts -}}
+{{- end -}}
+{{- if $mounts -}}
+{{- toYaml $mounts -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Generate volumes
+*/}}
+{{- define "chart.volumes" -}}
+{{- $volumes := list -}}
+{{- if .Values.webhook.enabled -}}
+{{- $certVolume := dict "name" "cert" 
+    "secret" (dict 
+        "secretName" (.Values.webhook.tls.name | required "webhook.tls.name is required")
+        "defaultMode" 420
+    ) -}}
+{{- $volumes = append $volumes $certVolume -}}
+{{- end -}}
+{{- if .Values.extraVolumes -}}
+{{- $volumes = concat $volumes .Values.extraVolumes -}}
+{{- end -}}
+{{- if $volumes -}}
+{{- toYaml $volumes -}}
+{{- end -}}
 {{- end -}}

helm/charts/envoy-xds-controller/templates/deployment.yaml

@@ -41,23 +41,18 @@ spec:
       {{- end }}
       containers:
       - image: {{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}
-        {{- if .Values.args }}
+        {{- if or .Values.args .Values.cacheAPI.enabled }}
         args:
+          {{- if .Values.args }}
           {{- toYaml .Values.args | nindent 10 }}
+          {{- end }}
           {{- if .Values.cacheAPI.enabled }}
           - --development={{ .Values.development }}
           - --enable-cache-api=true
           - --cache-api-port={{ .Values.cacheAPI.port }}
           - --cache-api-scheme={{ .Values.cacheAPI.scheme }}
           - --cache-api-addr={{ .Values.cacheAPI.address }}
           {{- end }}
-        {{- else if .Values.cacheAPI.enabled }}
-        args:
-          - --development={{ .Values.development }}
-          - --enable-cache-api=true
-          - --cache-api-port={{ .Values.cacheAPI.port }}
-          - --cache-api-scheme={{ .Values.cacheAPI.scheme }}
-          - --cache-api-addr={{ .Values.cacheAPI.address }}
         {{- end }}
         env:
           - name: XDS_PORT
@@ -92,14 +87,14 @@ spec:
           {{- tpl . $ | nindent 10 }}
         {{- end }}
         {{- if .Values.webhook.enabled }}
-        {{- if .Values.webhook.tls.name }}
+          {{- if .Values.webhook.tls.name }}
           - name: TLS_SECRET_NAME
             value: {{ .Values.webhook.tls.name }}
-        {{- end }}
-        {{- if .Values.webhook.port }}
+          {{- end }}
+          {{- if .Values.webhook.port }}
           - name: WEBHOOK_PORT
             value: "{{ .Values.webhook.port }}"
-        {{- end }}
+          {{- end }}
         {{- end }}
         {{- if not .Values.webhook.enabled }}
           - name: WEBHOOK_DISABLE
@@ -120,15 +115,16 @@ spec:
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         name: envoy-xds-controller
         resources:
-{{ toYaml .Values.resources | indent 12 }}
-{{- if .Values.webhook.enabled }}
+          {{- toYaml .Values.resources | nindent 12 }}
+        {{- /* Volume Mounts */}}
+        {{- $mounts := include "chart.volumeMounts" . }}
+        {{- if $mounts }}
         volumeMounts:
-        - mountPath: /tmp/k8s-webhook-server/serving-certs
-          name: cert
-          readOnly: true
+          {{- $mounts | nindent 10 }}
+        {{- end }}
+      {{- /* Volumes */}}
+      {{- $volumes := include "chart.volumes" . }}
+      {{- if $volumes }}
       volumes:
-      - name: cert
-        secret:
-          defaultMode: 420
-          secretName: {{ .Values.webhook.tls.name }}
-{{- end }}
+        {{- $volumes | nindent 8 }}
+      {{- end }}

helm/charts/envoy-xds-controller/values.yaml

@@ -152,6 +152,16 @@ secrets: {}
 #     username: "logstash"
 #     password: "password"
 
+# -- Extra Volumes for the pod
+extraVolumes: []
+  # - name: example
+  #   configMap:
+  #     name: example
+
+# -- Extra Volume Mounts for the container
+extraVolumeMounts: []
+  # - name: example
+  #   mountPath: /example
 
 # Validating Webhook Options
 webhook: