feat: Add keycloak configuration (#3)

appuio · Sep 4, 2023 · f63f2bb · f63f2bb
1 parent b10f088
commit f63f2bb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/class/defaults.yml b/class/defaults.yml
@@ -6,8 +6,13 @@ parameters:
     grafana_username: ""
     grafana_password: ""
     grafana_url: http://vshn-appuio-grafana/
-    control_api_url: https://api.appuio.cloud/
-    control_api_token: ?{vaultkv:${cluster:tenant}/${cluster:name}/grafana-organizations-operator/control_api_token}
+    keycloak_client_id: admin-cli
+    keycloak_realm: vshn-realm
+    keycloak_url: https://id.vshn.net
+    keycloak_username: ?{vaultkv:${cluster:tenant}/${cluster:name}/grafana-organizations-operator/keycloak_username}
+    keycloak_password: ?{vaultkv:${cluster:tenant}/${cluster:name}/grafana-organizations-operator/keycloak_password}
+    keycloak_admin_group_path: "/LDAP/VSHN Ops"
+    keycloak_auto_assign_org_group_path: "/LDAP/VSHN Staff"
     requests:
       cpu: '25m'
       memory: '128Mi'

diff --git a/component/main.jsonnet b/component/main.jsonnet
@@ -13,11 +13,16 @@ local namespace_meta = {
 
 local secret = kube.Secret('grafana-organizations-operator') + namespace_meta {
   stringData: {
-    CONTROL_API_URL: params.control_api_url,
-    CONTROL_API_TOKEN: params.control_api_token,
     GRAFANA_URL: params.grafana_url,
     GRAFANA_USERNAME: params.grafana_username,
     GRAFANA_PASSWORD: params.grafana_password,
+    KEYCLOAK_USERNAME: params.keycloak_username,
+    KEYCLOAK_PASSWORD: params.keycloak_password,
+    KEYCLOAK_CLIENT_ID: params.keycloak_client_id,
+    KEYCLOAK_URL: params.keycloak_url,
+    KEYCLOAK_REALM: params.keycloak_realm,
+    KEYCLOAK_ADMIN_GROUP_PATH: params.keycloak_admin_group_path,
+    KEYCLOAK_AUTO_ASSIGN_ORG_GROUP_PATH: params.keycloak_auto_assign_org_group_path,
   },
 };
 

diff --git a/...s/golden/defaults/grafana-organizations-operator/grafana-organizations-operator/main.yaml b/...s/golden/defaults/grafana-organizations-operator/grafana-organizations-operator/main.yaml
@@ -8,11 +8,16 @@ metadata:
   name: grafana-organizations-operator
   namespace: vshn-appuio-grafana
 stringData:
-  CONTROL_API_TOKEN: t-silent-test-1234/c-green-test-1234/grafana-organizations-operator/control_api_token
-  CONTROL_API_URL: https://api.appuio.cloud/
   GRAFANA_PASSWORD: ''
   GRAFANA_URL: http://vshn-appuio-grafana/
   GRAFANA_USERNAME: ''
+  KEYCLOAK_ADMIN_GROUP_PATH: /LDAP/VSHN Ops
+  KEYCLOAK_AUTO_ASSIGN_ORG_GROUP_PATH: /LDAP/VSHN Staff
+  KEYCLOAK_CLIENT_ID: admin-cli
+  KEYCLOAK_PASSWORD: t-silent-test-1234/c-green-test-1234/grafana-organizations-operator/keycloak_password
+  KEYCLOAK_REALM: vshn-realm
+  KEYCLOAK_URL: https://id.vshn.net
+  KEYCLOAK_USERNAME: t-silent-test-1234/c-green-test-1234/grafana-organizations-operator/keycloak_username
 type: Opaque
 ---
 apiVersion: apps/v1