From 7484081996bf9faa087946f55d1a7e10917e683a Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 2 Jan 2025 16:28:31 +0100
Subject: [PATCH] Fix the init container
---
dbrepo-auth-service/init/app.py | 2 +-
docker-compose.yml | 3 +++
helm/dbrepo/templates/auth-secret.yaml | 3 +++
helm/dbrepo/values.yaml | 2 +-
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dbrepo-auth-service/init/app.py b/dbrepo-auth-service/init/app.py
index d3a26a42fe..7d43f163fa 100644
--- a/dbrepo-auth-service/init/app.py
+++ b/dbrepo-auth-service/init/app.py
@@ -12,7 +12,7 @@ user_id = admin.get_user_id(username=system_username)
print(f'Successfully fetched user id: {user_id}')
try:
- conn = mariadb.connect(user="root",
+ conn = mariadb.connect(user=os.getenv('METADATA_USERNAME', 'root'),
password=os.getenv('METADATA_DB_PASSWORD', 'dbrepo'),
host="metadata-db",
port=3306,
diff --git a/docker-compose.yml b/docker-compose.yml
index abf0e0ec18..ca7c642c4d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -119,6 +119,9 @@ services:
AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-admin}
AUTH_SERVICE_ADMIN_PASSWORD: ${AUTH_SERVICE_ADMIN_PASSWORD:-admin}
AUTH_SERVICE_ENDPOINT: ${AUTH_SERVICE_ENDPOINT:-http://auth-service:8080}
+ METADATA_DB: "${METADATA_DB:-dbrepo}"
+ METADATA_DB_PASSWORD: "${METADATA_DB_PASSWORD:-dbrepo}"
+ METADATA_USERNAME: "root"
SYSTEM_USERNAME: "${SYSTEM_USERNAME:-admin}"
depends_on:
dbrepo-auth-service:
diff --git a/helm/dbrepo/templates/auth-secret.yaml b/helm/dbrepo/templates/auth-secret.yaml
index 4010e66a8d..a568ef2500 100644
--- a/helm/dbrepo/templates/auth-secret.yaml
+++ b/helm/dbrepo/templates/auth-secret.yaml
@@ -9,5 +9,8 @@ stringData:
AUTH_SERVICE_ADMIN: "{{ .Values.authservice.auth.adminUser }}"
AUTH_SERVICE_ADMIN_PASSWORD: "{{ .Values.authservice.auth.adminPassword }}"
AUTH_SERVICE_ENDPOINT: "{{ .Values.authservice.endpoint }}"
+ METADATA_DB: "{{ .Values.metadatadb.db.name }}"
+ METADATA_DB_PASSWORD: "{{ .Values.metadatadb.rootUser.password }}"
+ METADATA_USERNAME: "{{ .Values.metadatadb.rootUser.user }}"
SYSTEM_USERNAME: "{{ .Values.identityservice.users }}"
{{- end }}
diff --git a/helm/dbrepo/values.yaml b/helm/dbrepo/values.yaml
index ab3c8e9d50..cd52f413e1 100644
--- a/helm/dbrepo/values.yaml
+++ b/helm/dbrepo/values.yaml
@@ -112,7 +112,7 @@ authservice:
init:
image:
## @skip authservice.init.image.name
- name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.6.0
+ name: registry.datalab.tuwien.ac.at/dbrepo/auth-service-init:1.6.0rc1
## @param authservice.init.resourcesPreset The container resource preset
resourcesPreset: "nano"
## @param authservice.init.resources Set container requests and limits for different resources like CPU or memory (essential for production workloads)
--
GitLab