turn on SSO
This commit is contained in:
@@ -50,13 +50,13 @@ spec:
|
||||
- secretRef:
|
||||
name: {{ include "it-cost-dashboard.fullname" . }}-server-secret
|
||||
# Readiness hits a DB-backed route on purpose: a pod only takes
|
||||
# traffic once MySQL is reachable AND the schema is right.
|
||||
# NOTE (SSO restore): /api/years will 307 to /login once the
|
||||
# middleware is back on, which is non-2xx — add a public /api/health
|
||||
# route and probe that instead.
|
||||
# traffic once MySQL is reachable. /api/health is allow-listed in
|
||||
# src/auth.config.ts, so the middleware lets it through unauthenticated
|
||||
# instead of 307-ing it to /login (which would be non-2xx and would
|
||||
# keep the pod permanently unready).
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /api/years
|
||||
path: /api/health
|
||||
port: http
|
||||
initialDelaySeconds: 10
|
||||
periodSeconds: 5
|
||||
|
||||
@@ -18,11 +18,13 @@ stringData:
|
||||
# Break-glass local login. Empty disables it entirely (src/auth.ts fails closed).
|
||||
LOCAL_ADMIN_PASSWORD: {{ .Values.secrets.localAdminPassword | default "" | quote }}
|
||||
|
||||
# --- SSO DISABLED FOR CICD TEST ---
|
||||
# Kept present but optional. To restore SSO: supply these values from the
|
||||
# per-env GitHub secrets and swap `| default ""` for `| required "..."`.
|
||||
AUTH_MICROSOFT_ENTRA_ID_ID: {{ .Values.secrets.entraClientId | default "" | quote }}
|
||||
AUTH_MICROSOFT_ENTRA_ID_SECRET: {{ .Values.secrets.entraClientSecret | default "" | quote }}
|
||||
AUTH_MICROSOFT_ENTRA_ID_ISSUER: {{ .Values.secrets.entraIssuer | default "" | quote }}
|
||||
AUTH_URL: {{ .Values.secrets.authUrl | default "" | quote }}
|
||||
# --- END SSO DISABLED ---
|
||||
# Microsoft Entra ID SSO. Required: a deploy fails loudly rather than shipping
|
||||
# a build whose sign-in button 500s.
|
||||
AUTH_MICROSOFT_ENTRA_ID_ID: {{ required "secrets.entraClientId is required" .Values.secrets.entraClientId | quote }}
|
||||
AUTH_MICROSOFT_ENTRA_ID_SECRET: {{ required "secrets.entraClientSecret is required" .Values.secrets.entraClientSecret | quote }}
|
||||
AUTH_MICROSOFT_ENTRA_ID_ISSUER: {{ required "secrets.entraIssuer is required" .Values.secrets.entraIssuer | quote }}
|
||||
# Derived from the ingress host so the OAuth callback URL always matches what
|
||||
# is registered in Entra. AUTH_TRUST_HOST alone would leave Auth.js depending
|
||||
# on X-Forwarded-Proto; if that is ever wrong it builds an http:// callback and
|
||||
# Entra rejects it with AADSTS50011 (http is invalid for non-localhost).
|
||||
AUTH_URL: {{ printf "https://%s" (required "ingress.host is required" .Values.ingress.host) | quote }}
|
||||
|
||||
@@ -31,4 +31,4 @@ ingress:
|
||||
enabled: true
|
||||
className: nginx
|
||||
# TODO: point this at a hostname resolving to the ingress-nginx external IP.
|
||||
host: it-cost-dashboard.trendmicro.com
|
||||
host: it-cost-dashboard-prod.trendmicro.com
|
||||
|
||||
+6
-6
@@ -50,12 +50,12 @@ secrets:
|
||||
dbRootPassword: "" # from GitHub secret DB_ROOT_PASSWORD_<ENV>
|
||||
# Optional; empty disables local login entirely (src/auth.ts fails closed).
|
||||
localAdminPassword: ""
|
||||
# --- SSO restore: set these (and swap `default ""` for `required` in
|
||||
# templates/server-secret.yaml) when Entra ID is re-enabled ---
|
||||
# entraClientId: ""
|
||||
# entraClientSecret: ""
|
||||
# entraIssuer: ""
|
||||
# authUrl: ""
|
||||
# Microsoft Entra ID SSO. Supplied per-env by the CI workflow from GitHub
|
||||
# secrets; server-secret.yaml marks them required, so a deploy fails loudly
|
||||
# rather than shipping a build whose sign-in button 500s.
|
||||
entraClientId: ""
|
||||
entraClientSecret: ""
|
||||
entraIssuer: ""
|
||||
|
||||
# Pre-created manually, once per namespace (see the deploy notes). Not templated:
|
||||
# the kubelet needs it independently of Helm.
|
||||
|
||||
Reference in New Issue
Block a user