Merge pull request #34 from small-hack/fix-env-file-again

fix string templating error with env file

Author: jessebot

charts/pixelfed/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.14.2
+version: 0.14.3
 
 # This is the version number of the application being deployed.
 # renovate:image=ghcr.io/mattlqx/docker-pixelfed

charts/pixelfed/README.md

@@ -1,6 +1,6 @@
 # pixelfed
 
-![Version: 0.14.2](https://img.shields.io/badge/Version-0.14.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.12.4-nginx](https://img.shields.io/badge/AppVersion-v0.12.4--nginx-informational?style=flat-square)
+![Version: 0.14.3](https://img.shields.io/badge/Version-0.14.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.12.4-nginx](https://img.shields.io/badge/AppVersion-v0.12.4--nginx-informational?style=flat-square)
 
 A Helm chart for deploying Pixelfed on Kubernetes
 
@@ -109,7 +109,7 @@ A Helm chart for deploying Pixelfed on Kubernetes
 | pixelfed.image_quality | int | `80` | Set the image optimization quality, between 1-100. Lower uses less space, higher more quality |
 | pixelfed.instance.contact_email | string | `""` | The public contact email for your server |
 | pixelfed.instance.contact_form | bool | `false` | enable the instance contact form |
-| pixelfed.instance.contact_max_per_day | string | `""` | instance contact max per day |
+| pixelfed.instance.contact_max_per_day | int | `1` | instance contact max per day |
 | pixelfed.instance.cur_reg | bool | `false` | Enable Curated Registration |
 | pixelfed.instance.description | string | `"Pixelfed - Photo sharing for everyone"` | your server description |
 | pixelfed.instance.discover_public | bool | `false` | Enable public access to the Discover feature |

charts/pixelfed/templates/configmap_env.yaml

@@ -14,7 +14,9 @@ data:
   APP_DOMAIN: {{ . }}
   {{- end }}
 
-  EXP_LOOPS: {{ .Values.pixelfed.exp_loops }}
+  {{- with .Values.pixelfed.exp_loops }}
+  EXP_LOOPS: {{ . }}
+  {{- end }}
 
   # registration related
   OPEN_REGISTRATION: {{ .Values.pixelfed.open_registration | quote }}
@@ -26,7 +28,7 @@ data:
   # not sure where to put this
   CUSTOM_EMOJI: {{ .Values.pixelfed.custom_emoji | quote }}
   CUSTOM_EMOJI_MAX_SIZE: {{ .Values.pixelfed.custom_emoji | quote }}
-  MEDIA_TYPES: {{ .Values.pixelfed.media_types }}
+  MEDIA_TYPES: {{ .Values.pixelfed.media_types | quote }}
 
   # limits
   MIN_PASSWORD_LENGTH: {{ .Values.pixelfed.min_password_length | quote }}
@@ -96,9 +98,9 @@ data:
   MEDIA_DELETE_LOCAL_AFTER_CLOUD: {{ .Values.pixelfed.media_delete_local_after_cloud | quote }}
 
   # covid
-  ENABLE_COVID_LABEL: {{ .Values.pixelfed.covid.enable_label }}
-  COVID_LABEL_URL: {{ .Values.pixelfed.covid.label_url }}
-  COVID_LABEL_ORG: {{ .Values.pixelfed.covid.label_org }}
+  ENABLE_COVID_LABEL: {{ .Values.pixelfed.covid.enable_label | quote }}
+  COVID_LABEL_URL: {{ .Values.pixelfed.covid.label_url | quote }}
+  COVID_LABEL_ORG: {{ .Values.pixelfed.covid.label_org | quote }}
 
   {{- with .Values.pixelfed.banned_usernames }}
   BANNED_USERNAMES: {{ . }}
@@ -110,7 +112,9 @@ data:
   AP_SHAREDINBOX: {{ .Values.pixelfed.activity_pub.sharedinbox | quote }}
   AP_INBOX: {{ .Values.pixelfed.activity_pub.inbox | quote }}
   AP_OUTBOX: {{ .Values.pixelfed.activity_pub.outbox | quote }}
-  AP_LOGGER_ENABLED: {{ .Values.pixelfed.activity_pub.logger_enabled | quote }}
+  {{- with .Values.pixelfed.activity_pub.logger_enabled }}
+  AP_LOGGER_ENABLED: {{ . | quote }}
+  {{- end }}
 
   # mail
   MAIL_DRIVER: "{{ .Values.pixelfed.mail.driver }}"

charts/pixelfed/values.yaml

@@ -440,7 +440,7 @@ pixelfed:
     # -- The public contact email for your server
     contact_email: ""
     # -- instance contact max per day
-    contact_max_per_day: ""
+    contact_max_per_day: 1
     # -- Enable the profile embed feature
     profile_embeds: true
     # -- Enable the post embed feature