Merge pull request #150 from jontze/chore/fix-helm-empty-env-vars

chore(helm): Fix crash due to empty env vars
jontze · Apr 6, 2024 · 6515376 · 6515376
2 parents a061da8 + d75f6c8
commit 6515376
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/helm/cadency/Chart.yaml b/helm/cadency/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: cadency
 description: Helm chart to deploy the cadency discord bot.
-version: 0.2.0
+version: 0.2.1
 appVersion: "0.5.1"
 type: application
 maintainers:

diff --git a/helm/cadency/templates/deployment.yaml b/helm/cadency/templates/deployment.yaml
@@ -48,24 +48,31 @@ spec:
         image: "{{ .Values.image.name }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         env:
+          {{- $configMapName := include "cadency.fullname" . -}}
+          {{- with .Values.cadency.config }}
           - name: "RUST_LOG"
             valueFrom:
               configMapKeyRef:
-                name: {{ include "cadency.fullname" . }}
+                name: {{ $configMapName }}
                 key: logLevel
                 optional: true
+          {{- if .playlistSongLimit }}
           - name: "CADENCY_PLAYLIST_SONG_LIMIT"
             valueFrom:
               configMapKeyRef:
-                name: {{ include "cadency.fullname" . }}
+                name: {{ $configMapName }}
                 key: playlistSongLimit
                 optional: true
+          {{- end }}
+          {{- if .songLengthLimit }}
           - name: "CADENCY_SONG_LENGTH_LIMIT"
             valueFrom:
               configMapKeyRef:
-                name: {{ include "cadency.fullname" . }}
+                name: {{ $configMapName }}
                 key: songLengthLimit
                 optional: true
+          {{- end }}
+          {{- end }}
           {{- $createdSecretName := include "cadency.fullname" . -}}
           {{- with .Values.cadency.discordToken }}
           - name: DISCORD_TOKEN