fix: if application.*db_uri is null then don't create a env var *DB_URI for it in Pod

Signed-off-by: Siddharth Tiwari <[email protected]>

Author: o-c-e

auto-deploy

@@ -168,7 +168,7 @@ function auto_database_uri() {
   # but DB_URI will still contain the value set by user
 
   db=${1}
-  case ${db} in
+  case "${db}" in
 
   mariadb)
     uri="jdbc:mysql://${MARIADB_RELEASE_NAME}:3306/${MARIADB_DB}?username=${MARIADB_USER}&password=${MARIADB_PASSWORD}"

chart/lambda/templates/db-initialize-job.yaml

@@ -34,16 +34,26 @@ spec:
             name: {{ .Values.application.secretName }}
         {{- end }}
         env:
+        {{- if .Values.application.postgresql_uri }}
         - name: POSTGRESQL_URI
           value: {{ .Values.application.postgresql_uri | quote }}
+        {{- end }}
+        {{- if .Values.application.redis_uri }}
         - name: REDIS_URI
           value: {{ .Values.application.redis_uri | quote }}
+        {{- end }}
+        {{- if .Values.application.mysql_uri }}
         - name: MYSQL_URI
           value: {{ .Values.application.mysql_uri | quote }}
+        {{- end }}
+        {{- if .Values.application.mariadb_uri }}
         - name: MARIADB_URI
           value: {{ .Values.application.mariadb_uri | quote }}
+        {{- end }}
+        {{- if .Values.application.mongodb_uri }}
         - name: MONGODB_URI
           value: {{ .Values.application.mongodb_uri | quote }}
+        {{- end }}
         - name: ENVIRONMENT_NAME
           value: {{ .Values.project.env | quote }}
         - name: ENVIRONMENT_URL

chart/lambda/templates/db-migrate-hook.yaml

@@ -34,16 +34,26 @@ spec:
             name: {{ .Values.application.secretName }}
         {{- end }}
         env:
+        {{- if .Values.application.postgresql_uri }}
         - name: POSTGRESQL_URI
           value: {{ .Values.application.postgresql_uri | quote }}
+        {{- end }}
+        {{- if .Values.application.redis_uri }}
         - name: REDIS_URI
           value: {{ .Values.application.redis_uri | quote }}
+        {{- end }}
+        {{- if .Values.application.mysql_uri }}
         - name: MYSQL_URI
           value: {{ .Values.application.mysql_uri | quote }}
+        {{- end }}
+        {{- if .Values.application.mariadb_uri }}
         - name: MARIADB_URI
           value: {{ .Values.application.mariadb_uri | quote }}
+        {{- end }}
+        {{- if .Values.application.mongodb_uri }}
         - name: MONGODB_URI
           value: {{ .Values.application.mongodb_uri | quote }}
+        {{- end }}
         - name: ENVIRONMENT_NAME
           value: {{ .Values.project.env | quote }}
         - name: ENVIRONMENT_URL

chart/lambda/templates/deployment.yaml

@@ -57,16 +57,26 @@ spec:
             name: {{ .Values.application.secretName }}
         {{- end }}
         env:
+        {{- if .Values.application.postgresql_uri }}
         - name: POSTGRESQL_URI
           value: {{ .Values.application.postgresql_uri | quote }}
+        {{- end }}
+        {{- if .Values.application.redis_uri }}
         - name: REDIS_URI
           value: {{ .Values.application.redis_uri | quote }}
+        {{- end }}
+        {{- if .Values.application.mysql_uri }}
         - name: MYSQL_URI
           value: {{ .Values.application.mysql_uri | quote }}
+        {{- end }}
+        {{- if .Values.application.mariadb_uri }}
         - name: MARIADB_URI
           value: {{ .Values.application.mariadb_uri | quote }}
+        {{- end }}
+        {{- if .Values.application.mongodb_uri }}
         - name: MONGODB_URI
           value: {{ .Values.application.mongodb_uri | quote }}
+        {{- end }}
         - name: ENVIRONMENT_NAME
           value: {{ .Values.project.env | quote }}
         - name: ENVIRONMENT_URL

chart/lambda/templates/worker-deployment.yaml

@@ -62,16 +62,26 @@ items:
               name: {{ $.Values.application.secretName }}
           {{- end }}
           env:
+          {{- if $.Values.application.postgresql_uri }}
           - name: POSTGRESQL_URI
             value: {{ $.Values.application.postgresql_uri | quote }}
+          {{- end}}
+          {{- if $.Values.application.redis_uri }}
           - name: REDIS_URI
             value: {{ $.Values.application.redis_uri | quote }}
+          {{- end }}
+          {{- if $.Values.application.mysql_uri }}
           - name: MYSQL_URI
             value: {{ $.Values.application.mysql_uri | quote }}
+          {{- end }}
+          {{- if $.Values.application.mariadb_uri }}
           - name: MARIADB_URI
             value: {{ $.Values.application.mariadb_uri | quote }}
+          {{- end }}
+          {{- if $.Values.application.mongodb_uri }}
           - name: MONGODB_URI
             value: {{ $.Values.application.mongodb_uri | quote }}
+          {{- end }}
           - name: ENVIRONMENT_NAME
             value: {{ $.Values.project.env | quote }}
 {{- with $livenessProbeConfig := default $.Values.livenessProbe $workerConfig.livenessProbe -}}