Skip to content

feat: migrate oauth2-proxy auth to the internal cloud zitadel - #1699

Merged
zackpollard merged 1 commit into
mainfrom
feat/migrate-oauth2-proxy-to-cloud-zitadel
Jun 18, 2026
Merged

feat: migrate oauth2-proxy auth to the internal cloud zitadel#1699
zackpollard merged 1 commit into
mainfrom
feat/migrate-oauth2-proxy-to-cloud-zitadel

Conversation

@zackpollard

Copy link
Copy Markdown
Member

No description provided.

point oauth2-proxy's oidc issuer at auth.internal.futo.org and source the
client id from the cloud zitadel 1password item. it's a public client
(PKCE, client secret unused); zitadel enforces the Granted role grant via
project_role_check, so no further config changes.
@zackpollard
zackpollard requested a review from a team as a code owner June 18, 2026 11:24
@github-actions

Copy link
Copy Markdown
--- HelmRelease: authentication/oauth2-proxy Deployment: authentication/oauth2-proxy

+++ HelmRelease: authentication/oauth2-proxy Deployment: authentication/oauth2-proxy

@@ -42,13 +42,13 @@

           value: .immich.cloud
         - name: OAUTH2_PROXY_EMAIL_DOMAINS
           value: '*'
         - name: OAUTH2_PROXY_HTTP_ADDRESS
           value: 0.0.0.0:4180
         - name: OAUTH2_PROXY_OIDC_ISSUER_URL
-          value: https://zitadel.internal.immich.cloud
+          value: https://auth.internal.futo.org
         - name: OAUTH2_PROXY_PASS_ACCESS_TOKEN
           value: 'true'
         - name: OAUTH2_PROXY_PROVIDER
           value: oidc
         - name: OAUTH2_PROXY_PROVIDER_DISPLAY_NAME
           value: ZITADEL

@github-actions

Copy link
Copy Markdown
--- kubernetes/apps/authentication/oauth2-proxy/secrets Kustomization: flux-system/oauth2-proxy-secrets ExternalSecret: authentication/oauth2-proxy-oauth-client

+++ kubernetes/apps/authentication/oauth2-proxy/secrets Kustomization: flux-system/oauth2-proxy-secrets ExternalSecret: authentication/oauth2-proxy-oauth-client

@@ -8,13 +8,13 @@

     kustomize.toolkit.fluxcd.io/namespace: flux-system
   name: oauth2-proxy-oauth-client
   namespace: authentication
 spec:
   data:
   - remoteRef:
-      key: ZITADEL_OAUTH_CLIENT_ID_OAUTH2_PROXY
+      key: FUTO_ZITADEL_OAUTH_CLIENT_ID_OAUTH2_PROXY
     secretKey: OAUTH2_PROXY_CLIENT_ID
   - remoteRef:
       key: OAUTH2_PROXY_COOKIE_SECRET
     secretKey: OAUTH2_PROXY_COOKIE_SECRET
   refreshInterval: 20s
   secretStoreRef:
--- kubernetes/apps/authentication/oauth2-proxy/app Kustomization: flux-system/oauth2-proxy HelmRelease: authentication/oauth2-proxy

+++ kubernetes/apps/authentication/oauth2-proxy/app Kustomization: flux-system/oauth2-proxy HelmRelease: authentication/oauth2-proxy

@@ -38,13 +38,13 @@

             env:
               OAUTH2_PROXY_CLIENT_SECRET: unused
               OAUTH2_PROXY_CODE_CHALLENGE_METHOD: S256
               OAUTH2_PROXY_COOKIE_DOMAINS: .immich.cloud
               OAUTH2_PROXY_EMAIL_DOMAINS: '*'
               OAUTH2_PROXY_HTTP_ADDRESS: 0.0.0.0:4180
-              OAUTH2_PROXY_OIDC_ISSUER_URL: https://zitadel.internal.immich.cloud
+              OAUTH2_PROXY_OIDC_ISSUER_URL: https://auth.internal.futo.org
               OAUTH2_PROXY_PASS_ACCESS_TOKEN: 'true'
               OAUTH2_PROXY_PROVIDER: oidc
               OAUTH2_PROXY_PROVIDER_DISPLAY_NAME: ZITADEL
               OAUTH2_PROXY_REDIRECT_URL: https://oauth2-proxy.internal.immich.cloud/oauth2/callback
               OAUTH2_PROXY_REVERSE_PROXY: 'true'
               OAUTH2_PROXY_SKIP_PROVIDER_BUTTON: 'true'

@zackpollard
zackpollard merged commit ba2e18f into main Jun 18, 2026
22 checks passed
@zackpollard
zackpollard deleted the feat/migrate-oauth2-proxy-to-cloud-zitadel branch June 18, 2026 17:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants