minor fix

getredash · Mar 27, 2024 · 4f023b0 · 4f023b0
1 parent 53fa556
commit 4f023b0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -106,7 +106,7 @@ Shared environment block used across each component.
   valueFrom:
     secretKeyRef:
       name: {{ .Release.Name }}-postgresql
-      key: postgresql-password
+      key: password
 - name: REDASH_DATABASE_HOSTNAME
   value: {{ include "redash.postgresql.fullname" . }}
 - name: REDASH_DATABASE_PORT

diff --git a/templates/configmap.yaml b/templates/configmap.yaml
@@ -33,21 +33,12 @@ data:
       ATTEMPTS=$((ATTEMPTS+1))
 
       # Install and upgrade
-      if [[ "${1}" == "install" ]]; then
-        echo "Installing Redash:"
-        timeout $CREATE_TIMEOUT /app/manage.py database create_tables
-        echo "Tables created"
-        echo "Running Redash database migrations after install"
-        timeout $UPGRADE_TIMEOUT /app/manage.py db upgrade
-        echo "Upgrade complete"
-      fi
-
-      # Upgrade
-      if [[ "${1}" == "upgrade" ]]; then
-        echo "Running Redash database migrations:"
-        timeout $UPGRADE_TIMEOUT /app/manage.py db upgrade
-        echo "Upgrade complete"
-      fi
+      echo "Installing Redash:"
+      timeout $CREATE_TIMEOUT /app/manage.py database create_tables
+      echo "Tables created"
+      echo "Running Redash database migrations after install"
+      timeout $UPGRADE_TIMEOUT /app/manage.py db upgrade
+      echo "Upgrade complete"
 
       STATUS=$(timeout $STATUS_TIMEOUT /app/manage.py status 2>&1)
       RETCODE=$?

diff --git a/templates/hook-migrations-job.yaml b/templates/hook-migrations-job.yaml
@@ -36,7 +36,7 @@ spec:
           {{- toYaml .Values.migrations.securityContext | nindent 10 }}
         image: {{ .Values.image.registry }}/{{ .Values.image.repo }}:{{ .Values.image.tag }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
-        command: ["/bin/bash", "/config/install-upgrade.sh", "upgrade"]
+        command: ["/bin/bash", "/config/install-upgrade.sh"]
         volumeMounts:
           - name: config
             mountPath: /config