From b8bae474e7a54d196e11e960caa20abf2ec796d6 Mon Sep 17 00:00:00 2001
From: Ralf Grubenmann <ralf.grubenmann@gmail.com>
Date: Wed, 17 Apr 2024 16:04:44 +0200
Subject: [PATCH] fix env var name

---
 helm-chart/renku/templates/data-service/deployment.yaml   | 8 +++++++-
 .../renku/templates/secrets-storage/deployment.yaml       | 5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/helm-chart/renku/templates/data-service/deployment.yaml b/helm-chart/renku/templates/data-service/deployment.yaml
index 20d1a29271..12e24fe0b0 100644
--- a/helm-chart/renku/templates/data-service/deployment.yaml
+++ b/helm-chart/renku/templates/data-service/deployment.yaml
@@ -68,7 +68,7 @@ spec:
                   key: dataServiceKeycloakClientSecret
             - name: ENCRYPTION_KEY_PATH
               value: /secrets/encryptionKey
-            - name: SECRET_SERVICE_PUBLIC_KEY_PATH
+            - name: SECRETS_SERVICE_PUBLIC_KEY_PATH
               value: /secrets/publicKey
             - name: SERVER_DEFAULTS
               value: /etc/renku-data-service/server_options/server_defaults.json
@@ -157,8 +157,14 @@ spec:
         - name: encryption-key
           secret:
             secretName: {{ template "renku.fullname" . }}-secrets-storage
+            items:
+            - key: encryptionKey
+              path: encryptionKey
         - name: secret-service-public-key
           secret:
             secretName: {{ template "renku.fullname" . }}-secret-service-public-key
+            items:
+            - key: publicKey
+              path: publicKey
         {{- include "certificates.volumes" . | nindent 8 }}
       serviceAccountName: {{ template "renku.fullname" . }}-data-service
diff --git a/helm-chart/renku/templates/secrets-storage/deployment.yaml b/helm-chart/renku/templates/secrets-storage/deployment.yaml
index d946954803..173610f47e 100644
--- a/helm-chart/renku/templates/secrets-storage/deployment.yaml
+++ b/helm-chart/renku/templates/secrets-storage/deployment.yaml
@@ -54,7 +54,7 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.global.db.common.passwordSecretName }}
                   key: password
-            - name: SECRET_SERVICE_PRIVATE_KEY_PATH
+            - name: SECRETS_SERVICE_PRIVATE_KEY_PATH
               value: /secrets/privateKey
           livenessProbe:
             httpGet:
@@ -88,6 +88,9 @@ spec:
         - name: secret-service-private-key
           secret:
             secretName: {{ template "renku.fullname" . }}-secret-service-private-key
+            items:
+            - key: privateKey
+              path: privateKey
         {{- include "certificates.volumes" . | nindent 8 }}
     {{- with .Values.secretsStorage.nodeSelector }}
       nodeSelector: