Skip to content

Commit 1f9dbbd

Browse files
committed
fix(headlamp): pin OIDC callback URL explicitly
Add OIDC_CALLBACK_URL=https://headlamp.makeitwork.cloud/oidc-callback to the headlamp-oidc Secret and a (placeholder) callbackURL in the chart's oidc config so the chart renders the -oidc-callback-url arg. Removes any ambiguity from Headlamp inferring the callback URL from the request's Host header behind the Cloudflare proxy.
1 parent cdc944a commit 1f9dbbd

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

operators/headlamp/application.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ spec:
3535
# doesn't depend on window.opener postMessage (which drops state
3636
# across cross-origin redirects through Dex/GitHub).
3737
useCookie: true
38+
# Pin the callback URL Headlamp advertises to Dex so it doesn't
39+
# depend on Host-header inference behind the Cloudflare proxy.
40+
# Actual env value comes from headlamp-oidc Secret's OIDC_CALLBACK_URL.
41+
callbackURL: "set-by-secret"
3842
serviceAccount:
3943
create: true
4044
clusterRoleBinding:

operators/headlamp/oidc-secret.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ stringData:
1111
OIDC_CLIENT_SECRET: ENC[AES256_GCM,data:TXBMWVAEU7OLNJx6mrZcK3rbLlTB9GL5hTAAXTwwzSa9xTXLU8l/MJ51g2YcbmSWu8bNGa5mi1bExzkvSGhwXQ==,iv:xKDnl7qCPM2ttNWW2OU2a1f4FNzHDz+loLLKuBdN5+g=,tag:CT1vk4kf0sEKdXy9CUVgbg==,type:str]
1212
OIDC_ISSUER_URL: https://argocd.makeitwork.cloud/api/dex
1313
OIDC_SCOPES: openid profile email groups
14+
OIDC_CALLBACK_URL: https://headlamp.makeitwork.cloud/oidc-callback
1415
sops:
1516
age:
1617
- recipient: age152ek83tm4fj5u70r3fecytn4kg7c5xca24erjchxexx4pfqg6das7q763l
@@ -22,7 +23,7 @@ sops:
2223
Y2FhOENiWW1aNy9WbER3eXIvNXhXRnMKzdWk5njxD8yiSjhv5a1jZ9giCZWTnNpK
2324
jvqHY7FMWuQMowlEwkbpgUeEbcf4kabl5clCr4w7mh0doYWt3u/7SQ==
2425
-----END AGE ENCRYPTED FILE-----
25-
lastmodified: "2026-04-30T03:57:26Z"
26-
mac: ENC[AES256_GCM,data:/3YRM68bw/3U5LqF6N44kHoONeGPTvickVVaoKOf+LiPCo91juSE/23q79ppDwjLROUaVf67peZoP+m/F/qM+0hGBTnunzgn3DencYeb640YEcuoJnAkrwMqQvcFjXKMBVFjeV5hN97/hY9FOPtgyEhHTQPSOkQvm/XDhhJXGeo=,iv:ghbaV+s9zgWRm+CsJVdLjNNijTyVaFXtaDT3aHRJBb0=,tag:oUSJ5Dwkd7V+HGyDxvdoOg==,type:str]
26+
lastmodified: "2026-04-30T04:08:46Z"
27+
mac: ENC[AES256_GCM,data:E2iADOwXoG6bcZesH+S6s9GCeas+Yqty6CYr1BhI2fNeyb7I2IlaPwadhx40cEH7DN/Rr4aId1VF3M6e4Vti3EA6qDfAEqOsPEX65QeVQHXwjHQQr8185EvxvNz0mILFtl5FWWTYUcP8JkTzkSmKwFlNmakV0QWpniJknKRH9O8=,iv:dXObwnkkpZ8woN4+v9eDCpKIXnBlmJzmZO5d9/YK8ag=,tag:QPrVNoUuYH/gJCaoaNrClQ==,type:str]
2728
encrypted_regex: ^(token|api-token|apiToken|clientID|clientSecret|client_id|client_secret|password|secret|github_token|CLOUDFLARE_API_TOKEN|credentials\.json|.*_SERVICE_KEY|GF_AUTH_GITHUB_CLIENT_SECRET|GF_SECURITY_ADMIN_PASSWORD|dex\.[a-z]+\.clientID|dex\.[a-z]+\.clientSecret|OIDC_CLIENT_(ID|SECRET))$
2829
version: 3.12.2

0 commit comments

Comments
 (0)