Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kubernetes/apps/mapache.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# --from-literal=MQTT_PASSWORD="$(cd ../../infrastructure/infra/environments/prod && terraform output -raw mqtt_password)" \
# --from-literal=KERBECS_PASSWORD=... \
# --from-literal=SENTINEL_CLIENT_SECRET=... \
# --from-literal=SENTINEL_TOKEN=... \
# --from-literal=SENTINEL_SA_TOKEN=... \
# --from-literal=AWS_ACCESS_KEY_ID=... \
# --from-literal=AWS_SECRET_ACCESS_KEY=...
#
Expand Down
17 changes: 7 additions & 10 deletions kubernetes/manifests/mapache/auth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,26 +63,23 @@ spec:
secretKeyRef:
name: mapache-secrets
key: KERBECS_PASSWORD
# Sentinel v5 (the k8s deployment) is up, but the OAuth client +
# JWKS for mapache haven't been migrated over yet. Keep pointing
# at the legacy hosts until that cutover happens, then bump both
# to https://sentinel-v5.gauchoracing.com.
# Sentinel v5: JWKS lives at /api/core/keys under SENTINEL_URL,
# so the separate JWKS env var is gone. SA token replaces the
# v4 static SENTINEL_TOKEN.
- name: SENTINEL_URL
value: https://sentinel-api.gauchoracing.com
- name: SENTINEL_JWKS_URL
value: https://sso.gauchoracing.com/.well-known/jwks.json
value: https://sentinel-v5.gauchoracing.com
- name: SENTINEL_CLIENT_ID
value: z6V9NREjMFhf
value: TIvD6jCH3mGV
- name: SENTINEL_CLIENT_SECRET
valueFrom:
secretKeyRef:
name: mapache-secrets
key: SENTINEL_CLIENT_SECRET
- name: SENTINEL_TOKEN
- name: SENTINEL_SA_TOKEN
valueFrom:
secretKeyRef:
name: mapache-secrets
key: SENTINEL_TOKEN
key: SENTINEL_SA_TOKEN
- name: SENTINEL_REDIRECT_URI
value: https://mapache.gauchoracing.com/auth/login
---
Expand Down
10 changes: 4 additions & 6 deletions kubernetes/manifests/mapache/query.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,12 @@ spec:
secretKeyRef:
name: mapache-secrets
key: KERBECS_PASSWORD
# See auth.yaml — keep on legacy Sentinel until the mapache
# cutover happens, then bump both to sentinel-v5.gauchoracing.com.
# Sentinel v5: JWKS lives at /api/core/keys under SENTINEL_URL,
# so the separate JWKS env var is gone (main.py derives it).
- name: SENTINEL_URL
value: https://sentinel-api.gauchoracing.com
- name: SENTINEL_JWKS_URL
value: https://sso.gauchoracing.com/.well-known/jwks.json
value: https://sentinel-v5.gauchoracing.com
- name: SENTINEL_CLIENT_ID
value: z6V9NREjMFhf
value: TIvD6jCH3mGV
---
apiVersion: v1
kind: Service
Expand Down