diff --git a/chart/templates/api/deployment.yaml b/chart/templates/api/deployment.yaml index f99388e4..4360dd40 100644 --- a/chart/templates/api/deployment.yaml +++ b/chart/templates/api/deployment.yaml @@ -78,32 +78,6 @@ spec: value: {{ .Values.global.postgres.kyoo_api.host | quote }} - name: PGPORT value: {{ .Values.global.postgres.kyoo_api.port | quote }} - {{- range $index, $provider := .Values.kyoo.oidc_providers }} - - name: OIDC_{{ $provider.name | upper }}_NAME - value: {{ $provider.name | quote }} - - name: OIDC_{{ $provider.name | upper }}_LOGO - value: {{ $provider.logo | quote }} - - name: OIDC_{{ $provider.name | upper }}_CLIENTID - valueFrom: - secretKeyRef: - key: {{ $provider.clientIdKey }} - name: {{ $provider.existingSecret }} - - name: OIDC_{{ $provider.name | upper }}_SECRET - valueFrom: - secretKeyRef: - key: {{ $provider.clientSecretKey }} - name: {{ $provider.existingSecret }} - - name: OIDC_{{ $provider.name | upper }}_AUTHORIZATION - value: {{ $provider.authorizationAddress | quote }} - - name: OIDC_{{ $provider.name | upper }}_TOKEN - value: {{ $provider.tokenAddress | quote }} - - name: OIDC_{{ $provider.name | upper }}_PROFILE - value: {{ $provider.profileAddress | quote }} - - name: OIDC_{{ $provider.name | upper }}_SCOPE - value: {{ $provider.scope | quote }} - - name: OIDC_{{ $provider.name | upper }}_AUTHMETHOD - value: {{ $provider.authMethod | default "ClientSecretBasic" | quote }} - {{- end }} {{- with (concat .Values.global.extraEnv .Values.api.kyoo_api.extraEnv) }} {{- toYaml . | nindent 12 }} {{- end }} diff --git a/chart/templates/auth/deployment.yaml b/chart/templates/auth/deployment.yaml index eaa15afa..8b1e7ea9 100644 --- a/chart/templates/auth/deployment.yaml +++ b/chart/templates/auth/deployment.yaml @@ -100,6 +100,32 @@ spec: - name: RSA_PRIVATE_KEY_PATH value: /mnt/private_key/private_key.pem {{- end }} + {{- range $index, $provider := .Values.kyoo.oidc_providers }} + - name: OIDC_{{ $provider.name | upper }}_NAME + value: {{ $provider.name | quote }} + - name: OIDC_{{ $provider.name | upper }}_LOGO + value: {{ $provider.logo | quote }} + - name: OIDC_{{ $provider.name | upper }}_CLIENTID + valueFrom: + secretKeyRef: + key: {{ $provider.clientIdKey }} + name: {{ $provider.existingSecret }} + - name: OIDC_{{ $provider.name | upper }}_SECRET + valueFrom: + secretKeyRef: + key: {{ $provider.clientSecretKey }} + name: {{ $provider.existingSecret }} + - name: OIDC_{{ $provider.name | upper }}_AUTHORIZATION + value: {{ $provider.authorizationAddress | quote }} + - name: OIDC_{{ $provider.name | upper }}_TOKEN + value: {{ $provider.tokenAddress | quote }} + - name: OIDC_{{ $provider.name | upper }}_PROFILE + value: {{ $provider.profileAddress | quote }} + - name: OIDC_{{ $provider.name | upper }}_SCOPE + value: {{ $provider.scope | quote }} + - name: OIDC_{{ $provider.name | upper }}_AUTHMETHOD + value: {{ $provider.authMethod | default "ClientSecretBasic" | quote }} + {{- end }} {{- with (concat .Values.global.extraEnv .Values.auth.kyoo_auth.extraEnv) }} {{- toYaml . | nindent 12 }} {{- end }}