helmupdate

This commit is contained in:
yasar 2023-03-20 18:27:12 +05:30
parent f5a36601de
commit 1ddda44a0b
3 changed files with 11 additions and 81 deletions

View File

@ -35,28 +35,8 @@ spec:
envFrom:
- configMapRef:
name: hsd-oauth-proxy-env-cm
env:
- 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}}
- secretRef:
name: hsd-oauth-proxy-es
{{- range $k, $v := .Values.optionalEnvVariables }}
- name: {{ $k | quote }}
value: {{ $v | quote }}

View File

@ -3,27 +3,13 @@ kind: ConfigMap
metadata:
name: hsd-oauth-proxy-env-cm
data:
OAUTH2_PROXY_AUTH_LOGGING: {{ .Values.envVariables.OAUTH2_PROXY_AUTH_LOGGING | quote }}
OAUTH2_PROXY_AUTH_LOGGING_FORMAT: {{ .Values.envVariables.OAUTH2_PROXY_AUTH_LOGGING_FORMAT | quote }}
OAUTH2_PROXY_COOKIE_DOMAINS: {{ .Values.envVariables.OAUTH2_PROXY_COOKIE_DOMAINS | quote }}
OAUTH2_PROXY_COOKIE_EXPIRE: {{ .Values.envVariables.OAUTH2_PROXY_COOKIE_EXPIRE | quote }}
OAUTH2_PROXY_COOKIE_NAME: {{ .Values.envVariables.OAUTH2_PROXY_COOKIE_NAME | 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_INTROSPECT_URL: {{ .Values.envVariables.OAUTH2_PROXY_INTROSPECT_URL | quote }}
OAUTH2_PROXY_LOGIN_URL: {{ .Values.envVariables.OAUTH2_PROXY_LOGIN_URL | quote }}
OAUTH2_PROXY_METRICS_ADDRESS: {{ .Values.envVariables.OAUTH2_PROXY_METRICS_ADDRESS | quote }}
OAUTH2_PROXY_OIDC_ISSUER_URL: {{ .Values.envVariables.OAUTH2_PROXY_OIDC_ISSUER_URL | quote }}
OAUTH2_PROXY_OIDC_JWKS_URL: {{ .Values.envVariables.OAUTH2_PROXY_OIDC_JWKS_URL | quote }}
OAUTH2_PROXY_PROFILE_URL: {{ .Values.envVariables.OAUTH2_PROXY_PROFILE_URL | quote }}
OAUTH2_PROXY_PROXY_PREFIX: {{ .Values.envVariables.OAUTH2_PROXY_PROXY_PREFIX | quote }}
OAUTH2_PROXY_REDEEM_URL: {{ .Values.envVariables.OAUTH2_PROXY_REDEEM_URL | quote }}
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_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 }}
OAUTH2_PROXY_COOKIE_SECURE: "true"
OAUTH2_PROXY_EMAIL_DOMAINS: "*"
@ -40,4 +26,5 @@ data:
OAUTH2_PROXY_PROVIDER: "oidc"
OAUTH2_PROXY_PROVIDER_DISPLAY_NAME: "oidc"
OAUTH2_PROXY_SESSION_STORE_TYPE: "redis"
OAUTH2_PROXY_UPSTREAMS: "static://"
OAUTH2_PROXY_UPSTREAMS: "static://"
OAUTH2_PROXY_REDIS_USE_CLUSTER: "true"

View File

@ -64,52 +64,15 @@ nodeSelector: {}
tolerations: []
affinity: {}
envFromSecret:
OAUTH2_PROXY_CLIENT_ID:
secretKeyRef:
name: oauth-secrets
key: clientId
OAUTH2_PROXY_CLIENT_SECRET:
secretKeyRef:
name: oauth-secrets
key: clientSecret
OAUTH2_PROXY_COOKIE_SECRET:
secretKeyRef:
name: oauth-secrets
key: cookieSecret
OAUTH2_PROXY_REDIS_CONNECTION_URL:
secretKeyRef:
name: redis
key: oauthRedisConnectionUrl
envVariables:
#mandatory input variables
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/callback"
#optional input variables with default values
OAUTH2_PROXY_COOKIE_EXPIRE: "24h0m0s"
OAUTH2_PROXY_COOKIE_REFRESH: "0h28m0s"
OAUTH2_PROXY_HTTP_ADDRESS: "0.0.0.0:8080" #Any change in port number needs to be updated in service port
OAUTH2_PROXY_METRICS_ADDRESS: "0.0.0.0:9090" #Any change in port number needs to be updated in service port
OAUTH2_PROXY_AUTH_LOGGING: "true"
OAUTH2_PROXY_AUTH_LOGGING_FORMAT: "info|CustomLogEvent||OAuth2Proxy|{{.Client}} - [{{.Timestamp}}] [{{.Status}}] {{.Message}}"
OAUTH2_PROXY_REQUEST_LOGGING: "true"
OAUTH2_PROXY_REQUEST_LOGGING_FORMAT: "info|CustomLogEvent||OAuth2Proxy|{{.Client}} - [{{.Timestamp}}] {{.Host}} {{.RequestMethod}} {{.Upstream}} {{.RequestURI}} {{.Protocol}} {{.UserAgent}} {{.StatusCode}} {{.ResponseSize}} {{.RequestDuration}}"
OAUTH2_PROXY_STANDARD_LOGGING: "true"
OAUTH2_PROXY_STANDARD_LOGGING_FORMAT: "info|CustomLogEvent||OAuth2Proxy|[{{.Timestamp}}] [{{.File}}] {{.Message}}"
OAUTH2_PROXY_PROXY_PREFIX: ""
OAUTH2_PROXY_REDIRECT_URL: "/oauth2/callback"
OAUTH2_PROXY_COOKIE_EXPIRE: "24h0m0s"
OAUTH2_PROXY_COOKIE_REFRESH: "0h28m0s"
#Any additional OAuth2 specific enviroment variables can be passed here
optionalEnvVariables: {}