From 4ddcc668ec0c1419a08e6da32a0d80ac290b43d1 Mon Sep 17 00:00:00 2001
From: Omar Siam <Omar.Siam@oeaw.ac.at>
Date: Wed, 30 Oct 2024 14:03:24 +0100
Subject: [PATCH] The postgres user name is fixed to openatlas

---
 .github/auto-deploy-values.yaml | 2 +-
 chart/templates/configmap.yaml  | 1 +
 chart/templates/secret.yaml     | 1 -
 chart/values.yaml               | 3 +--
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/auto-deploy-values.yaml b/.github/auto-deploy-values.yaml
index ffda85abc..2480a42bd 100644
--- a/.github/auto-deploy-values.yaml
+++ b/.github/auto-deploy-values.yaml
@@ -3,7 +3,7 @@ postgis:
   deploy: ${DEPLOY_DATABASE}
   host: "${POSTGRES_HOST}"
   name: "${POSTGRES_DB}"
-  user: "${POSTGRES_USER}"
+  # ${POSTGRES_PASSWORD} is ignored, it has to be openatlas
   password: "${POSTGRES_PASSWORD}"
   version: "15-3.4"
 
diff --git a/chart/templates/configmap.yaml b/chart/templates/configmap.yaml
index ca94c4084..a7844dd65 100644
--- a/chart/templates/configmap.yaml
+++ b/chart/templates/configmap.yaml
@@ -2,6 +2,7 @@
 apiVersion: v1
 data:
   POSTGRES_DB: {{ .Values.postgis.name | default (printf "%s" (include "fullname" .)) | quote }}
+  POSTGRES_USER: openatlas
 kind: ConfigMap
 metadata:
   annotations:
diff --git a/chart/templates/secret.yaml b/chart/templates/secret.yaml
index 5d4fc834b..f1ccf498e 100644
--- a/chart/templates/secret.yaml
+++ b/chart/templates/secret.yaml
@@ -11,5 +11,4 @@ metadata:
   name: {{ template "fullname" . }}-secret
 data:
   POSTGRES_PASSWORD: {{ (randAlphaNum 16) | b64enc }}
-  POSTGRES_USER: {{ .Values.postgis.user | default (printf "%s" (include "fullname" .)) | b64enc }}
 {{- end -}}
\ No newline at end of file
diff --git a/chart/values.yaml b/chart/values.yaml
index 559493751..e4484e603 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -5,10 +5,9 @@
 postgis:
   deploy: true
   version: "15-3.4"
-  # Set host, name, user if database is external
+  # Set host, name if database is external. The user has to be openatlas.
   # host: postgres
   # name: openatlas-test
-  # user: openatlas
   # Set this to anything also with deploy: true to keep the generated password
   # password: openatlas