From 22ce6366f3327bb92eb6b03402a88b407637e212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Urban?= <burban@inovex.de>
Date: Wed, 11 Oct 2023 18:00:20 +0200
Subject: [PATCH] fix(infra): update chart values

---
 deploy/charts/Chart.yaml                |  2 +-
 deploy/charts/templates/deployment.yaml | 10 ++++++++++
 deploy/charts/templates/secret.yaml     |  4 +++-
 deploy/charts/templates/service.yaml    |  2 +-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/deploy/charts/Chart.yaml b/deploy/charts/Chart.yaml
index c2ff1f5..4814141 100644
--- a/deploy/charts/Chart.yaml
+++ b/deploy/charts/Chart.yaml
@@ -1,4 +1,4 @@
 apiVersion: v2
 name: kubevoyage
 description: A Helm chart for Kubernetes auth proxy
-version: 0.5.0
\ No newline at end of file
+version: 0.6.0
\ No newline at end of file
diff --git a/deploy/charts/templates/deployment.yaml b/deploy/charts/templates/deployment.yaml
index d0162d3..8959349 100644
--- a/deploy/charts/templates/deployment.yaml
+++ b/deploy/charts/templates/deployment.yaml
@@ -44,5 +44,15 @@ spec:
                 secretKeyRef:
                   name: {{ include "kubevoyage.fullname" . }}-secret
                   key: jwt-secret
+            - name: ADMIN_USER
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "kubevoyage.fullname" . }}-secret
+                  key: admin-user
+            - name: ADMIN_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: -secret
+                  key: admin-password
 
 
diff --git a/deploy/charts/templates/secret.yaml b/deploy/charts/templates/secret.yaml
index af21a37..2a7497b 100644
--- a/deploy/charts/templates/secret.yaml
+++ b/deploy/charts/templates/secret.yaml
@@ -6,4 +6,6 @@ metadata:
 type: Opaque
 data:
   db-password: {{ .Values.database.password | b64enc | quote }}
-  jwt-secret: {{ .Values.additionalEnvVars.jwtSecret }}
\ No newline at end of file
+  jwt-secret: {{ .Values.additionalEnvVars.jwtSecret }}
+  admin-user: {{ .Values.auth.adminUser }}
+  admin-password: {{ .Values.auth.adminPassword }}
\ No newline at end of file
diff --git a/deploy/charts/templates/service.yaml b/deploy/charts/templates/service.yaml
index 101b154..0023b84 100644
--- a/deploy/charts/templates/service.yaml
+++ b/deploy/charts/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "kubevoyage.fullname" . }}
+  name: kubevoyage
   namespace: {{ .Values.app.namespace }}
   labels:
     app: {{ include "kubevoyage.fullname" . }}