From 831c082cc52c785c89770192c8b73fca7eb49b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20Mei=C3=9Fl?= <stephan.meissl@eox.at>
Date: Wed, 21 Oct 2020 17:36:04 +0200
Subject: [PATCH] treat init-db.sh like a template
---
chart/files/init-db.sh | 7 +++++++
chart/templates/init-db-configmap.yaml | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/chart/files/init-db.sh b/chart/files/init-db.sh
index 5b05895c..58ff7402 100644
--- a/chart/files/init-db.sh
+++ b/chart/files/init-db.sh
@@ -4,6 +4,12 @@ if python3 manage.py id check "${COLLECTION}"; then
python3 manage.py coveragetype import /rgbnir_definition.json --traceback
+{{- if .Values.initDb }}
+
+ {{ .Values.initDb | nindent 6 }}
+
+{{- else }}
+
if [ "${COLLECTION}" == "VHR_IMAGE_2018" ]; then
echo "Initializing collection '${COLLECTION}'."
@@ -73,6 +79,7 @@ if python3 manage.py id check "${COLLECTION}"; then
--type swift \
--storage-auth auth-cloud-ovh
+{{- end }}
else
echo "Using existing database"
diff --git a/chart/templates/init-db-configmap.yaml b/chart/templates/init-db-configmap.yaml
index 6e130e1c..01b1be69 100644
--- a/chart/templates/init-db-configmap.yaml
+++ b/chart/templates/init-db-configmap.yaml
@@ -3,4 +3,4 @@ kind: ConfigMap
metadata:
name: {{ include "vs.fullname" . }}-init-db
data:
- {{ (.Files.Glob "files/init-db.sh").AsConfig | nindent 2}}
+ {{ (tpl (.Files.Glob "files/init-db.sh").AsConfig . ) | nindent 2}}
--
GitLab