ensure generated deployment meets spec

Author: holysoles

charts/pixelfed/templates/_helpers.tpl

@@ -82,9 +82,9 @@ Helper variable to check if autogenerated minio cert are enabled.
 */}}
 {{- define "pixelfed.minio.autogeneratedTls" -}}
 {{- if and .Values.minio.tls.enabled .Values.minio.tls.autoGenerated }}
-{{- true }}
+true
 {{- else }}
-{{- false }}
+false
 {{- end }}
 {{- end }}
 
@@ -93,7 +93,7 @@ Merge extraInitContainers with any expected ones from the minio subchart.
 */}}
 {{- define "pixelfed.mergedInitContainers" -}}
 {{- $mergedInitContainers := .Values.extraInitContainers }}
-{{- if (include "pixelfed.minio.autogeneratedTls" .) }}
+{{- if eq (include "pixelfed.minio.autogeneratedTls" .) "true" }}
 {{- $mergedInitContainers = append $mergedInitContainers .Values.minio.tls.pixelfedInitContainer }}
 {{- end }}
 {{- toYaml $mergedInitContainers }}
@@ -104,7 +104,7 @@ Merge extraVolumes with any expected ones from the minio subchart.
 */}}
 {{- define "pixelfed.mergedVolumes" -}}
 {{- $mergedVolumes := .Values.extraVolumes }}
-{{- if (include "pixelfed.minio.autogeneratedTls" .) }}
+{{- if eq (include "pixelfed.minio.autogeneratedTls" .) "true" }}
 {{- $mergedVolumes = concat $mergedVolumes .Values.minio.tls.pixelfedVolumes }}
 {{- end }}
 {{- toYaml $mergedVolumes }}
@@ -115,7 +115,7 @@ Merge extraVolumeMounts with any expected ones from the minio subchart.
 */}}
 {{- define "pixelfed.mergedVolumeMounts" -}}
 {{- $mergedVolumeMounts := .Values.extraVolumeMounts }}
-{{- if (include "pixelfed.minio.autogeneratedTls" .) }}
+{{- if eq (include "pixelfed.minio.autogeneratedTls" .) "true" }}
 {{- $mergedVolumeMounts = concat $mergedVolumeMounts .Values.minio.tls.pixelfedVolumeMounts }}
 {{- end }}
 {{- toYaml $mergedVolumeMounts }}

charts/pixelfed/templates/configmap_env.yaml

@@ -121,16 +121,16 @@ data:
   MAIL_FROM_NAME: "{{ .Values.pixelfed.mail.from_name }}"
 
   # s3
-  AWS_VISIBILITY: {{ .Values.pixelfed.s3.visibility }} #TODO override based on minio deployment
+  AWS_VISIBILITY: {{ .Values.pixelfed.s3.visibility | quote }}
   {{- if not .Values.minio.enabled }}
-  AWS_DEFAULT_REGION: {{ .Values.pixelfed.s3.region }}
-  AWS_BUCKET: {{ .Values.pixelfed.s3.bucket }}
+  AWS_DEFAULT_REGION: {{ .Values.pixelfed.s3.region | quote }}
+  AWS_BUCKET: {{ .Values.pixelfed.s3.bucket | quote }}
   AWS_USE_PATH_STYLE_ENDPOINT: {{ .Values.pixelfed.s3.use_path_style_endpoint | quote }}
   {{- else }}
   {{- if .Values.pixelfed.s3.bucket }}
-  AWS_BUCKET: {{ .Values.pixelfed.s3.bucket }}
+  AWS_BUCKET: {{ .Values.pixelfed.s3.bucket | quote }}
   {{- else }}
-  AWS_BUCKET: {{ index .Values.minio.provisioning.buckets 0 "name" }}
+  AWS_BUCKET: {{ index .Values.minio.provisioning.buckets 0 "name" | quote }}
   {{- end }}
   AWS_DEFAULT_REGION: "us-east-1" # unneeded for minio, but required for s3 driver
   AWS_USE_PATH_STYLE_ENDPOINT: "true" # expected for minio

charts/pixelfed/templates/deployment.yaml

@@ -38,9 +38,11 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with (include "pixelfed.mergedInitContainers" .) }}
+      {{- if len . | gt 0 }}
       initContainers:
         {{- . | nindent 8 }}
       {{- end }}
+      {{- end }}
       containers:
         {{- with .Values.extraContainers }}
           {{- toYaml . | nindent 10 }}
@@ -301,7 +303,7 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
 
-          {{- if or (include "pixelfed.mergedVolumeMounts" .) .Values.phpConfigs .Values.persistence.enabled }}
+          {{- if or (len (include "pixelfed.mergedVolumeMounts" .) | gt 0) .Values.phpConfigs .Values.persistence.enabled }}
           volumeMounts:
             {{- with (include "pixelfed.mergedVolumeMounts" .) }}
               {{- . | nindent 12 }}
@@ -317,7 +319,7 @@ spec:
             {{- end }}
           {{- end }}{{/* end volumeMounts */}}
 
-      {{- if or .Values.phpConfigs (include "pixelfed.mergedVolumes" .) .Values.persistence.enabled }}
+      {{- if or .Values.phpConfigs (len (include "pixelfed.mergedVolumes" .) | gt 0) .Values.persistence.enabled }}
       volumes:
         {{- with (include "pixelfed.mergedVolumes" .) }}
           {{- . | nindent 8 }}