From c295fd8e229745b172a6c98a14c862ba783411de Mon Sep 17 00:00:00 2001
From: yasar <mohamed.yasar@philips.com>
Date: Fri, 10 Mar 2023 16:35:51 +0530
Subject: [PATCH] secretenvupdate

---
 .../hsd-oauth-proxy/templates/deployment.yaml | 24 +++++++++++++++----
 .../templates/hsd-oauth-proxy-env-cm.yaml     |  1 -
 helm/hsd-oauth-proxy/values.yaml              |  4 ++--
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/helm/hsd-oauth-proxy/templates/deployment.yaml b/helm/hsd-oauth-proxy/templates/deployment.yaml
index 7846e5ee..37f098aa 100644
--- a/helm/hsd-oauth-proxy/templates/deployment.yaml
+++ b/helm/hsd-oauth-proxy/templates/deployment.yaml
@@ -36,10 +36,26 @@ spec:
             - configMapRef:
                 name: hsd-oauth-proxy-env-cm
           env:
-          {{- range $k, $v := .Values.envVariables }}
-            - name: {{ $k | quote }}
-              value: {{ $v | quote }}
-          {{- end }} 
+            - name: OAUTH2_PROXY_CLIENT_ID
+              valueFrom:
+                secretKeyRef:
+                  name: {{.Values.envFromSecret.OAUTH2_PROXY_CLIENT_ID.secretKeyRef.name}}
+                  key: {{.Values.envFromSecret.OAUTH2_PROXY_CLIENT_ID.secretKeyRef.key}}
+            - name: OAUTH2_PROXY_CLIENT_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: {{.Values.envFromSecret.OAUTH2_PROXY_CLIENT_SECRET.secretKeyRef.name}}
+                  key: {{.Values.envFromSecret.OAUTH2_PROXY_CLIENT_SECRET.secretKeyRef.key}}
+            - name: OAUTH2_PROXY_COOKIE_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: {{.Values.envFromSecret.OAUTH2_PROXY_COOKIE_SECRET.secretKeyRef.name}}
+                  key: {{.Values.envFromSecret.OAUTH2_PROXY_COOKIE_SECRET.secretKeyRef.key}}
+            - name: OAUTH2_PROXY_REDIS_CONNECTION_URL
+              valueFrom:
+                secretKeyRef:
+                  name: {{.Values.envFromSecret.OAUTH2_PROXY_REDIS_CONNECTION_URL.secretKeyRef.name}}
+                  key: {{.Values.envFromSecret.OAUTH2_PROXY_REDIS_CONNECTION_URL.secretKeyRef.key}}
           {{- range $k, $v := .Values.optionalEnvVariables }}
             - name: {{ $k | quote }}
               value: {{ $v | quote }}
diff --git a/helm/hsd-oauth-proxy/templates/hsd-oauth-proxy-env-cm.yaml b/helm/hsd-oauth-proxy/templates/hsd-oauth-proxy-env-cm.yaml
index eb981eef..3e0ae5db 100644
--- a/helm/hsd-oauth-proxy/templates/hsd-oauth-proxy-env-cm.yaml
+++ b/helm/hsd-oauth-proxy/templates/hsd-oauth-proxy-env-cm.yaml
@@ -21,7 +21,6 @@ data:
   OAUTH2_PROXY_REDIRECT_URL: {{ .Values.envVariables.OAUTH2_PROXY_REDIRECT_URL | quote }}
   OAUTH2_PROXY_REQUEST_LOGGING: {{ .Values.envVariables.OAUTH2_PROXY_REQUEST_LOGGING | quote }}
   OAUTH2_PROXY_REQUEST_LOGGING_FORMAT: {{ .Values.envVariables.OAUTH2_PROXY_REQUEST_LOGGING_FORMAT | quote }}
-  OAUTH2_PROXY_SESSION_STORE_TYPE: {{ .Values.envVariables.OAUTH2_PROXY_SESSION_STORE_TYPE | quote }}
   OAUTH2_PROXY_STANDARD_LOGGING: {{ .Values.envVariables.OAUTH2_PROXY_STANDARD_LOGGING | quote }}
   OAUTH2_PROXY_STANDARD_LOGGING_FORMAT: {{ .Values.envVariables.OAUTH2_PROXY_STANDARD_LOGGING_FORMAT | quote }}
   OAUTH2_PROXY_WHITELIST_DOMAINS: {{ .Values.envVariables.OAUTH2_PROXY_WHITELIST_DOMAINS | quote }}
diff --git a/helm/hsd-oauth-proxy/values.yaml b/helm/hsd-oauth-proxy/values.yaml
index 8aa988df..e483d68d 100644
--- a/helm/hsd-oauth-proxy/values.yaml
+++ b/helm/hsd-oauth-proxy/values.yaml
@@ -65,9 +65,9 @@ tolerations: []
 
 affinity: {}
 
-envFromSecrets: 
+envFromSecret: 
   OAUTH2_PROXY_CLIENT_ID:
-    secretKeyRef: 
+    secretKeyRef:
       name: oauthSecrets
       key: clientId
   OAUTH2_PROXY_CLIENT_SECRET: