dbildungs-iam-keycloak

dBildungsplattform · Nov 19, 2024 · 09badeb · 09badeb
1 parent 2082be0
commit 09badeb
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 71 deletions.
diff --git a/automation/dbildungs-iam-keycloak/Chart.yaml b/automation/dbildungs-iam-keycloak/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: SPSH-1324
+appVersion: SPSH-1195
 description: A Helm Chart for the dbildungs-iam-keycloak
 name: dbildungs-iam-keycloak
 type: application
-version: 0.0.0-spsh-1324-20241119-1434
+version: 0.0.0-spsh-1195-20241119-1628
diff --git a/automation/dbildungs-iam-keycloak/dev-realm-spsh.json b/automation/dbildungs-iam-keycloak/dev-realm-spsh.json
@@ -929,7 +929,7 @@
         "description": "",
         "rootUrl": "${KC_ROOT_URL}",
         "adminUrl": "",
-        "baseUrl": "${KC_ROOT_URL}",
+        "baseUrl": "",
         "surrogateAuthRequired": false,
         "enabled": true,
         "alwaysDisplayInConsole": false,
@@ -1983,6 +1983,7 @@
     "loginTheme": "schulportal",
     "eventsEnabled": false,
     "eventsListeners": [
+      "metrics-listener",
       "jboss-logging"
     ],
     "enabledEventTypes": [],

diff --git a/automation/dbildungs-iam-keycloak/prod-realm-spsh.json b/automation/dbildungs-iam-keycloak/prod-realm-spsh.json
@@ -927,7 +927,7 @@
         "description": "",
         "rootUrl": "${KC_ROOT_URL}",
         "adminUrl": "",
-        "baseUrl": "${KC_ROOT_URL}",
+        "baseUrl": "",
         "surrogateAuthRequired": false,
         "enabled": true,
         "alwaysDisplayInConsole": false,
@@ -1820,6 +1820,7 @@
     "loginTheme": "schulportal",
     "eventsEnabled": false,
     "eventsListeners": [
+      "metrics-listener",
       "jboss-logging"
     ],
     "enabledEventTypes": [],

diff --git a/automation/dbildungs-iam-keycloak/templates/configmap.yaml b/automation/dbildungs-iam-keycloak/templates/configmap.yaml
@@ -12,4 +12,3 @@ data:
   KC_PROXY: "edge"
   KEYCLOAK_ADMIN: admin
   KC_HTTP_MANAGEMENT_PORT: "8090"
-  STATUS_URL: "{{ .Values.status.url }}"
diff --git a/automation/dbildungs-iam-keycloak/templates/deployment.yaml b/automation/dbildungs-iam-keycloak/templates/deployment.yaml
@@ -10,9 +10,7 @@ spec:
     matchLabels:
       app.kubernetes.io/name: {{ template "common.names.name" . }}
       app.kubernetes.io/component: keycloak
-  {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
-  {{- end }}
   template:
     metadata:
       labels:
@@ -30,9 +28,8 @@ spec:
             {{- toYaml .command | nindent 16 }}
           {{- end }}
           args:
-            # - "--cache"
-            # - "local"
-            - "--optimized"
+            - "--cache"
+            - "local"
             - "--hostname"
             - "{{ tpl .Values.keycloakHostname . }}" 
             - "--import-realm"
@@ -48,8 +45,6 @@ spec:
           livenessProbe: {{- omit .Values.livenessProbe "enabled" | toYaml | nindent 12 }}
           readinessProbe: {{- omit .Values.readinessProbe "enabled" | toYaml | nindent 12 }}
           env:
-            - name: JAVA_OPTS_APPEND
-              value: "-Djgroups.dns.query={{ template "common.names.name" . }}-headless.{{ template "common.names.namespace" . }}.svc.cluster.local"
             - name: KEYCLOAK_ADMIN_PASSWORD
               valueFrom:
                 secretKeyRef:

diff --git a/automation/dbildungs-iam-keycloak/templates/headless-service.yaml b/automation/dbildungs-iam-keycloak/templates/headless-service.yaml
diff --git a/automation/dbildungs-iam-keycloak/templates/hpa.yaml b/automation/dbildungs-iam-keycloak/templates/hpa.yaml
diff --git a/automation/dbildungs-iam-keycloak/templates/keycloak-servicemonitor.yaml b/automation/dbildungs-iam-keycloak/templates/keycloak-servicemonitor.yaml
@@ -0,0 +1,21 @@
+{{- if .Values.keycloak.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: {{ template "common.names.name" . }}
+  namespace: {{ template "common.names.namespace" . }}
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+    app.kubernetes.io/component: keycloak
+spec:
+  namespaceSelector:
+    matchNames:
+      - {{ include "common.names.namespace" . | quote }}
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: {{ template "common.names.name" . }}
+  endpoints:
+    - port: {{ .Values.keycloak.serviceMonitor.port }}
+      path: {{ .Values.keycloak.serviceMonitor.path }}
+      interval: {{ .Values.keycloak.serviceMonitor.interval | default "30s" }}
+{{- end }}
diff --git a/automation/dbildungs-iam-keycloak/values.yaml b/automation/dbildungs-iam-keycloak/values.yaml
@@ -6,7 +6,7 @@ replicaCount: 1
 image:
   repository: ghcr.io/dbildungsplattform/dbildungs-iam-keycloak
   tag: ""
-  pullPolicy: Always
+  pullPolicy: Always 
 
 auth:
   # existingSecret: Refers to a secret already present in the cluster, which is required for the authentication and configuration of the database setup tasks.
@@ -38,7 +38,7 @@ database:
   password: ""
   username: "dbildungs_iam_keycloak"
 
-realm:
+realm: 
   name: dbilduns-iam-keycloak-realm
   filepath: "dev-realm-spsh.json"
 
@@ -110,11 +110,9 @@ service:
   ports:
     http: 80
 
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 5
-  targetCPUUtilizationPercentage: 60
-
-status:
-  url: "https://status.dev.spsh.dbildungsplattform.de/"
+keycloak:
+  serviceMonitor:
+    enabled: true
+    path: "/realms/SPSH/metrics"
+    endpoints:
+      - port: 'http'