From b8dac5f907bd101eb381b2d6a6de1fd346d2b410 Mon Sep 17 00:00:00 2001
From: yasar <mohamed.yasar@philips.com>
Date: Tue, 21 Mar 2023 12:22:46 +0530
Subject: [PATCH] updated deployment.yaml

---
 .../hsd-oauth-proxy/templates/deployment.yaml |  4 ++--
 .../templates/hsd-oauth-proxy-env-cm.yaml     | 11 -----------
 .../hsd-oauth-proxy-externalsecret.yaml       | 19 +++++++++++++++++++
 helm/hsd-oauth-proxy/values.yaml              | 11 +++++------
 4 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 helm/hsd-oauth-proxy/templates/hsd-oauth-proxy-externalsecret.yaml

diff --git a/helm/hsd-oauth-proxy/templates/deployment.yaml b/helm/hsd-oauth-proxy/templates/deployment.yaml
index f1f9d283..a48c69db 100644
--- a/helm/hsd-oauth-proxy/templates/deployment.yaml
+++ b/helm/hsd-oauth-proxy/templates/deployment.yaml
@@ -36,8 +36,8 @@ spec:
             - configMapRef:
                 name: hsd-oauth-proxy-env-cm
             - secretRef:
-                name:  hsd-oauth-proxy-es
-          {{- range $k, $v := .Values.optionalEnvVariables }}
+                name:  hsd-oauth-proxy-externalsecret
+          {{- range $k, $v := .Values.envVariables }}
             - name: {{ $k | quote }}
               value: {{ $v | quote }}
           {{- end }}   
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 7c51f50e..1e0a6b87 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
@@ -3,17 +3,6 @@ kind: ConfigMap
 metadata:
   name: hsd-oauth-proxy-env-cm
 data:
-
-  OAUTH2_PROXY_COOKIE_EXPIRE: {{ .Values.envVariables.OAUTH2_PROXY_COOKIE_EXPIRE | quote }}
-  OAUTH2_PROXY_COOKIE_REFRESH: {{ .Values.envVariables.OAUTH2_PROXY_COOKIE_REFRESH | quote }}
-  OAUTH2_PROXY_HTTP_ADDRESS: {{ .Values.envVariables.OAUTH2_PROXY_HTTP_ADDRESS | quote }}
-  OAUTH2_PROXY_METRICS_ADDRESS: {{ .Values.envVariables.OAUTH2_PROXY_METRICS_ADDRESS | quote }}
-  OAUTH2_PROXY_PROXY_PREFIX: {{ .Values.envVariables.OAUTH2_PROXY_PROXY_PREFIX | quote }}
-  OAUTH2_PROXY_REDIRECT_URL: {{ .Values.envVariables.OAUTH2_PROXY_REDIRECT_URL | quote }}
-  OAUTH2_PROXY_STANDARD_LOGGING: {{ .Values.envVariables.OAUTH2_PROXY_STANDARD_LOGGING | quote }}
-  OAUTH2_PROXY_REQUEST_LOGGING: {{ .Values.envVariables.OAUTH2_PROXY_REQUEST_LOGGING | quote }}
-  OAUTH2_PROXY_AUTH_LOGGING:  {{ .Values.envVariables.OAUTH2_PROXY_AUTH_LOGGING | quote }}
-
   OAUTH2_PROXY_COOKIE_SECURE: "true"
   OAUTH2_PROXY_EMAIL_DOMAINS: "*"
   OAUTH2_PROXY_INSECURE_OIDC_ALLOW_UNVERIFIED_EMAIL: "true"
diff --git a/helm/hsd-oauth-proxy/templates/hsd-oauth-proxy-externalsecret.yaml b/helm/hsd-oauth-proxy/templates/hsd-oauth-proxy-externalsecret.yaml
new file mode 100644
index 00000000..554eef01
--- /dev/null
+++ b/helm/hsd-oauth-proxy/templates/hsd-oauth-proxy-externalsecret.yaml
@@ -0,0 +1,19 @@
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: hsd-oauth-proxy-externalsecret
+spec:
+  secretStoreRef:
+    name: aws-parameter-cluster-store
+    kind: ClusterSecretStore
+  refreshInterval: "10m"
+  target:
+    name: hsd-oauth-proxy-externalsecret
+    creationPolicy: 'Owner' 
+  dataFrom:
+  - extract:
+     key: {{ .Values.secretStoreBasePath}}/authgateway/oauthproxy-secrets
+  - extract:
+     key: {{ .Values.secretStoreBasePath}}/authgateway/oauth-cookiedomain-env
+  - extract:
+     key: {{ .Values.secretStoreBasePath}}/authgateway/oauth-whitelistdomain-env
\ No newline at end of file
diff --git a/helm/hsd-oauth-proxy/values.yaml b/helm/hsd-oauth-proxy/values.yaml
index 5be65007..1678b5dd 100644
--- a/helm/hsd-oauth-proxy/values.yaml
+++ b/helm/hsd-oauth-proxy/values.yaml
@@ -76,9 +76,8 @@ envVariables:
   OAUTH2_PROXY_COOKIE_EXPIRE: "24h0m0s"
   OAUTH2_PROXY_COOKIE_REFRESH: "0h28m0s"
   
-  OAUTH2_PROXY_STANDARD_LOGGING: false
-  OAUTH2_PROXY_REQUEST_LOGGING: false
-  OAUTH2_PROXY_AUTH_LOGGING: false
- 
-#Any additional OAuth2 specific enviroment variables can be passed here
-optionalEnvVariables: {}
\ No newline at end of file
+  OAUTH2_PROXY_STANDARD_LOGGING: "false"
+  OAUTH2_PROXY_REQUEST_LOGGING: "false"
+  OAUTH2_PROXY_AUTH_LOGGING: "false"
+   
+  #Any additional OAuth2 specific enviroment variables can be added here