Do not generate empty ConfigMap

nano-byte · Dec 6, 2021 · fcb0d7e · fcb0d7e
1 parent 4c11c94
commit fcb0d7e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/charts/generic-service/templates/configmap.yaml b/charts/generic-service/templates/configmap.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.config }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -6,3 +7,4 @@ metadata:
 
 data:
   data.yaml: {{ .Values.config | toJson | quote }}
+{{- end }}
diff --git a/charts/generic-service/templates/controller.yaml b/charts/generic-service/templates/controller.yaml
@@ -49,7 +49,9 @@ spec:
 {{- if .Values.tracing.enabled }}
         traffic.sidecar.istio.io/excludeOutboundPorts: '5778,9411,14268,14250'  # Jaeger ports
 {{- end }}
+{{- if .Values.config }}
         checksum/config: {{ .Values.config | toJson | sha256sum }}
+{{- end }}
 {{- if .Values.secrets }}
         checksum/secrets: {{ .Values.secrets | toJson | sha256sum }}
 {{- end }}
@@ -65,9 +67,11 @@ spec:
           persistentVolumeClaim:
             claimName: {{ include "generic-service.fullname" . }}
         {{- end }}
+        {{- if .Values.config }}
         - name: config
           configMap:
             name: {{ include "generic-service.fullname" . }}
+        {{- end }}
         {{- range .Values.additionalConfigs }}
         - name: config-{{ . }}
           configMap:
@@ -129,9 +133,11 @@ spec:
             - name: {{ if eq .Values.controller "StatefulSet" }}{{ include "generic-service.fullname" . }}{{ else }}persistence{{ end }}
               mountPath: {{ required "Must specify persistence.mountPath when persistence.enabled" .Values.persistence.mountPath }}
             {{- end }}
+            {{- if .Values.config }}
             - name: config
               subPath: data.yaml
               mountPath: {{ .Values.configMountPath }}
+            {{- end }}
             {{- range .Values.additionalConfigs }}
             - name: config-{{ . }}
               subPath: data.yaml
@@ -149,9 +155,7 @@ spec:
             {{- if .Values.ingress.enabled }}
             - name: '{{ .Values.ingress.protocol }}-ingress'
               containerPort: {{ .Values.ingress.port }}
-
             {{- end }}
-
             {{- if .Values.monitoring.enabled }}
             - name: http-monitoring
               containerPort: {{ .Values.monitoring.port }}
@@ -219,7 +223,7 @@ spec:
               value: "6831"
             {{- end }}
             - name: CONFIG_FILE
-              value: {{ .Values.configMountPath }}{{ range .Values.additionalConfigs }}:/additional-configs/{{ . }}/data.yaml{{ end }}
+              value: '{{ if .Values.config }}{{ .Values.configMountPath }}{{ end }}{{ range .Values.additionalConfigs }}:/additional-configs/{{ . }}/data.yaml{{ end }}'
             {{- range $key, $val := .Values.env }}
             - name: {{ $key | quote }}
               value: {{ $val | quote }}