diff --git a/helm/hsd-oauth-proxy/templates/deployment.yaml b/helm/hsd-oauth-proxy/templates/deployment.yaml index 4e8b4619..8b0db1ea 100644 --- a/helm/hsd-oauth-proxy/templates/deployment.yaml +++ b/helm/hsd-oauth-proxy/templates/deployment.yaml @@ -56,6 +56,7 @@ spec: 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 3e0ae5db..db326b68 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 @@ -40,4 +40,4 @@ data: OAUTH2_PROXY_PROVIDER: "oidc" OAUTH2_PROXY_PROVIDER_DISPLAY_NAME: "oidc" OAUTH2_PROXY_SESSION_STORE_TYPE: "redis" - OAUTH2_PROXY_UPSTREAMS: "static://" \ No newline at end of file + OAUTH2_PROXY_UPSTREAMS: "static://" \ No newline at end of file diff --git a/helm/hsd-oauth-proxy/values.yaml b/helm/hsd-oauth-proxy/values.yaml index e483d68d..64487da4 100644 --- a/helm/hsd-oauth-proxy/values.yaml +++ b/helm/hsd-oauth-proxy/values.yaml @@ -68,34 +68,36 @@ affinity: {} envFromSecret: OAUTH2_PROXY_CLIENT_ID: secretKeyRef: - name: oauthSecrets + name: oauth-secrets key: clientId OAUTH2_PROXY_CLIENT_SECRET: secretKeyRef: - name: oauthSecrets + name: oauth-secrets key: clientSecret OAUTH2_PROXY_COOKIE_SECRET: secretKeyRef: - name: oauthSecrets + name: oauth-secrets key: cookieSecret OAUTH2_PROXY_REDIS_CONNECTION_URL: secretKeyRef: - name: oauthSecrets - key: redisConnectionUrl + name: redis + key: oauthRedisConnectionUrl envVariables: #mandatory input variables - OAUTH2_PROXY_COOKIE_DOMAINS: "" - OAUTH2_PROXY_COOKIE_NAME: "" - OAUTH2_PROXY_LOGIN_URL: "" - OAUTH2_PROXY_OIDC_ISSUER_URL: "" - OAUTH2_PROXY_OIDC_JWKS_URL: "" - OAUTH2_PROXY_PROFILE_URL: "" - OAUTH2_PROXY_INTROSPECT_URL: "" - OAUTH2_PROXY_REDEEM_URL: "" - OAUTH2_PROXY_WHITELIST_DOMAINS: "" + OAUTH2_PROXY_REDIS_CLUSTER_CONNECTION_URLS: "redis://hsd-development-cluster-pfm.qvw0di.0001.use1.cache.amazonaws.com:6379" + OAUTH2_PROXY_REDIS_USE_CLUSTER: "true" + OAUTH2_PROXY_COOKIE_DOMAINS: "cardioorg-test.us-east.philips-healthsuite.com" + OAUTH2_PROXY_COOKIE_NAME: "edi_session_edi-platform-foundationeks" + OAUTH2_PROXY_LOGIN_URL: "https://foundation-client-test.us-east.philips-healthsuite.com/loginapp" + OAUTH2_PROXY_OIDC_ISSUER_URL: "https://iam-client-test.us-east.philips-healthsuite.com/authorize/oauth2/v2" + OAUTH2_PROXY_OIDC_JWKS_URL: "https://iam-client-test.us-east.philips-healthsuite.com/authorize/oauth2/v2/jwks" + OAUTH2_PROXY_PROFILE_URL: "https://iam-client-test.us-east.philips-healthsuite.com/authorize/oauth2/v2/userinfo" + OAUTH2_PROXY_INTROSPECT_URL: "https://iam-client-test.us-east.philips-healthsuite.com/authorize/oauth2/v4/introspect" + OAUTH2_PROXY_REDEEM_URL: "https://iam-client-test.us-east.philips-healthsuite.com/authorize/oauth2/v2/token" + OAUTH2_PROXY_WHITELIST_DOMAINS: "cardioorg-test.us-east.philips-healthsuite.com" OAUTH2_PROXY_PROXY_PREFIX: "" - OAUTH2_PROXY_REDIRECT_URL: "" + OAUTH2_PROXY_REDIRECT_URL: "/oauth2/callback" #optional input variables with default values OAUTH2_PROXY_COOKIE_EXPIRE: "24h0m0s"