helm chart and docker add db envs (#46)

* rework database env docker + add db env to helm chart * add host envs and template secret name
georchestra · Feb 17, 2025 · b8a7347 · b8a7347
1 parent 83ef73f
commit b8a7347
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 17 deletions.
diff --git a/.envs-database b/.envs-database
@@ -0,0 +1,8 @@
+PGHOST=database
+PGPORT=5432
+PGDATABASE=georchestra
+PGUSER=georchestra
+PGPASSWORD=georchestra
+
+POSTGRES_USER=${PGUSER}
+POSTGRES_PASSWORD=${PGPASSWORD}
diff --git a/.gitignore b/.gitignore
@@ -169,3 +169,6 @@ cython_debug/
 
 # PyPI configuration file
 .pypirc
+
+# Custom for this repo
+.envs-database
diff --git a/docker-compose-solo.yml b/docker-compose-solo.yml
@@ -5,14 +5,8 @@ volumes:
 services:
   database:
     image: postgres:16
-    environment:
-      - PGHOST=database
-      - PGPORT=5432
-      - PGDATABASE=georchestra
-      - PGUSER=georchestra
-      - PGPASSWORD=georchestra
-      - POSTGRES_USER=georchestra
-      - POSTGRES_PASSWORD=georchestra
+    env_file:
+      - .envs-database
     ports:
       - "5432:5432"
     volumes:
@@ -48,16 +42,13 @@ services:
     volumes:
       - ./backend:/app
       - ./config/:/etc/maelstro/:ro
+    env_file:
+      - .envs-database
     environment:
       MAELSTRO_CONFIG: /etc/maelstro/config.yaml
       LOCAL_LOGIN: "testadmin"
       LOCAL_PASSWORD: "testadmin"
       DEMO_CRD: "test12"
-      PGHOST: "database"
-      PGPORT: "5432"
-      PGDATABASE: "georchestra"
-      PGUSER: "georchestra"
-      PGPASSWORD: "georchestra"
     command:
       - serve_docker_dev
 

diff --git a/helm/templates/_bootstrap-maelstro-configuration.tpl b/helm/templates/_bootstrap-maelstro-configuration.tpl
@@ -24,3 +24,53 @@
     name: ssh-secret
   {{- end }}
 {{- end -}}
+
+{{/*
+Insert database environment variables
+*/}}
+{{- define "maelstro.bootstrap_maelstro_database_envs" -}}
+{{- if .Values.database.auth.existingSecret }}
+{{- $secret_name := .Values.database.auth.existingSecret -}}
+- name: PGHOST
+  valueFrom:
+    secretKeyRef:
+        name: {{ $secret_name }}
+        key: host
+        optional: false
+- name: PGPORT
+  valueFrom:
+    secretKeyRef:
+        name: {{ $secret_name }}
+        key: port
+        optional: false
+- name: PGDATABASE
+  valueFrom:
+    secretKeyRef:
+        name: {{ $secret_name }}
+        key: dbname
+        optional: false
+- name: PGUSER
+  valueFrom:
+    secretKeyRef:
+        name: {{ $secret_name }}
+        key: user
+        optional: false
+- name: PGPASSWORD
+  valueFrom:
+    secretKeyRef:
+        name: {{ $secret_name }}
+        key: password
+        optional: false
+{{- else }}
+- name: PGHOST
+  value: {{ .Values.database.auth.host }}
+- name: PGPORT
+  value: {{ .Values.database.auth.port }}
+- name: PGDATABASE
+  value: {{ .Values.database.auth.database }}
+- name: PGUSER
+  value: {{ .Values.database.auth.username }}
+- name: PGPASSWORD
+  value: {{ .Values.database.auth.password }}
+{{- end }}
+{{- end }}
diff --git a/helm/templates/maelstro-backend-deployment.yaml b/helm/templates/maelstro-backend-deployment.yaml
@@ -52,6 +52,7 @@ spec:
           env:
             - name: MAELSTRO_CONFIG
               value: "/etc/georchestra/maelstro/config.yaml"
+            {{- include "maelstro.bootstrap_maelstro_database_envs" . | nindent 12 }}
             {{- range .Values.credentials }}
             - name: {{ .name }}_USERNAME
               valueFrom:

diff --git a/helm/templates/maelstro-frontend-deployment.yaml b/helm/templates/maelstro-frontend-deployment.yaml
@@ -52,6 +52,8 @@ spec:
           env:
             - name: CUSTOM_SCRIPTS_DIRECTORY
               value: "/etc/georchestra/maelstro/scripts"
+            - name: MAELSTRO_BACK_HOST
+              value: "{{ include "helm-maelstro.fullname" . }}-maelstro-backend-svc"
           {{- with .Values.maelstro_frontend.extra_environment }}
             {{- toYaml . | nindent 12 }}
           {{- end }}

diff --git a/helm/templates/maelstro-secrets.yaml b/helm/templates/maelstro-secrets.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: maelstro-creds-ext-plateform-secret
+  name: {{ include "helm-maelstro.fullname" . }}-creds-ext-plateform-secret
   labels:
     {{- include "helm-maelstro.labels" . | nindent 4 }}
 type: Opaque

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -2,7 +2,8 @@ maelstro_frontend:
   enabled: true
   replicaCount: 1
   image:
-    repository: test
+    repository: georchestra/maelstro-frontend
+    tag: latest
   tolerations: []
   affinity: {}
   extra_environment: []
@@ -21,7 +22,8 @@ maelstro_backend:
   enabled: true
   replicaCount: 1
   image:
-    repository: test
+    repository: georchestra/maelstro-backend
+    tag: latest
   tolerations: []
   affinity: {}
   extra_environment: []
@@ -52,4 +54,15 @@ datadir:
     emptyDir: {}
   git:
     url: https://github.com/georchestra/datadir.git
-    ref: docker-master
+    ref: docker-master
+
+database:
+  auth:
+    database: georchestra
+    host: georchestra
+    port: "5432"
+    username: georchestra
+    password: georchestra
+    # here specify the name of the secret to use
+    # existingSecret: mysecret
+