Skip to content

Commit 81b510a

Browse files
authored
feat: migrate prod and data grafana auth to the internal cloud zitadel (#1696)
1 parent 480da58 commit 81b510a

4 files changed

Lines changed: 12 additions & 8 deletions

File tree

kubernetes/apps/monitoring/grafana/app/grafana.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ spec:
1111
root_url: https://monitoring.immich.cloud/
1212
database:
1313
wal: "true"
14+
auth:
15+
oauth_allow_insecure_email_lookup: "true"
1416
auth.generic_oauth:
1517
enabled: "true"
1618
client_id: ${quote}${GRAFANA_OAUTH_CLIENT_ID}${quote}
1719
client_secret: ''
1820
use_pkce: "true"
1921
scopes: openid email profile groups offline_access
20-
auth_url: https://zitadel.internal.immich.cloud/oauth/v2/authorize
21-
token_url: https://zitadel.internal.immich.cloud/oauth/v2/token
22-
api_url: https://zitadel.internal.immich.cloud/oidc/v1/userinfo
22+
auth_url: https://auth.internal.futo.org/oauth/v2/authorize
23+
token_url: https://auth.internal.futo.org/oauth/v2/token
24+
api_url: https://auth.internal.futo.org/oidc/v1/userinfo
2325
role_attribute_path: role
2426
allow_assign_grafana_admin: "true"
2527
auto_login: "true"

kubernetes/apps/monitoring/grafana/secrets/oauth.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ spec:
1111
data:
1212
- secretKey: GRAFANA_OAUTH_CLIENT_ID
1313
remoteRef:
14-
key: ZITADEL_OAUTH_CLIENT_ID_GRAFANA_MONITORING_PROD
14+
key: FUTO_ZITADEL_OAUTH_CLIENT_ID_GRAFANA_MONITORING_PROD

kubernetes/apps/pipelines/data/grafana/app/grafana.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,17 @@ spec:
1111
root_url: https://grafana.data.immich.cloud/
1212
database:
1313
wal: "true"
14+
auth:
15+
oauth_allow_insecure_email_lookup: "true"
1416
auth.generic_oauth:
1517
enabled: "true"
1618
client_id: ${quote}${GRAFANA_OAUTH_CLIENT_ID}${quote}
1719
client_secret: ''
1820
use_pkce: "true"
1921
scopes: openid email profile groups offline_access
20-
auth_url: https://zitadel.internal.immich.cloud/oauth/v2/authorize
21-
token_url: https://zitadel.internal.immich.cloud/oauth/v2/token
22-
api_url: https://zitadel.internal.immich.cloud/oidc/v1/userinfo
22+
auth_url: https://auth.internal.futo.org/oauth/v2/authorize
23+
token_url: https://auth.internal.futo.org/oauth/v2/token
24+
api_url: https://auth.internal.futo.org/oidc/v1/userinfo
2325
role_attribute_path: role
2426
allow_assign_grafana_admin: "true"
2527
auto_login: "true"

kubernetes/apps/pipelines/data/grafana/secrets/oauth.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ spec:
1111
data:
1212
- secretKey: GRAFANA_OAUTH_CLIENT_ID
1313
remoteRef:
14-
key: ZITADEL_OAUTH_CLIENT_ID_GRAFANA_DATA_PROD
14+
key: FUTO_ZITADEL_OAUTH_CLIENT_ID_GRAFANA_DATA_PROD

0 commit comments

Comments
 (0)