diff --git a/automation/dbildungs-iam-server/Chart.lock b/automation/dbildungs-iam-server/Chart.lock index f628f581a..5264d00c7 100644 --- a/automation/dbildungs-iam-server/Chart.lock +++ b/automation/dbildungs-iam-server/Chart.lock @@ -3,4 +3,4 @@ dependencies: repository: https://charts.bitnami.com/bitnami version: 11.0.6 digest: sha256:790bafa04fe9c1cc9f772dc12fada16eb847c282f738fd23df09f665af93ec74 -generated: "2024-11-20T10:10:46.127056268Z" +generated: "2024-11-20T10:12:22.853322928Z" diff --git a/automation/dbildungs-iam-server/Chart.yaml b/automation/dbildungs-iam-server/Chart.yaml index 846a0448e..91ef1e0a7 100644 --- a/automation/dbildungs-iam-server/Chart.yaml +++ b/automation/dbildungs-iam-server/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: SPSH-1195 +appVersion: sha-c06bb57 dependencies: - condition: redis-cluster.enabled name: redis-cluster @@ -8,4 +8,4 @@ dependencies: description: dBildungs-IAM-server name: dbildungs-iam-server type: application -version: 0.0.0-spsh-1195-20241120-1010 +version: 0.0.1-20241120-1012 diff --git a/automation/dbildungs-iam-server/templates/backend-servicemonitor.yaml b/automation/dbildungs-iam-server/templates/backend-servicemonitor.yaml index 318e644b8..a1d511019 100644 --- a/automation/dbildungs-iam-server/templates/backend-servicemonitor.yaml +++ b/automation/dbildungs-iam-server/templates/backend-servicemonitor.yaml @@ -1,8 +1,8 @@ -{{ if .Values.backend.serviceMonitor.enabled }} +{{if .Values.backend.serviceMonitor.enabled }} apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: {{ template "common.names.name" . }} + name: {{ template "common.names.name" . }}-backend namespace: {{ template "common.names.namespace" . }} labels: {{- include "common.labels" . | nindent 4 }} @@ -13,11 +13,9 @@ spec: - {{ include "common.names.namespace" . | quote }} selector: matchLabels: - app.kubernetes.io/name: {{ template "common.names.name" . }} + app.kubernetes.io/name: {{ template "common.names.name" . }}-backend app.kubernetes.io/component: server-backend endpoints: - port: {{ (index .Values.backend.serviceMonitor.endpoints 0).port }} - path: {{ .Values.serviceMonitor.path }} - interval: {{ .Values.serviceMonitor.interval }} {{ end }} diff --git a/automation/dbildungs-iam-server/templates/configmap.yaml b/automation/dbildungs-iam-server/templates/configmap.yaml index 6b8d8ac73..cca9f526a 100644 --- a/automation/dbildungs-iam-server/templates/configmap.yaml +++ b/automation/dbildungs-iam-server/templates/configmap.yaml @@ -18,3 +18,5 @@ data: BACKEND_HOSTNAME: "{{ .Values.backendHostname }}" LDAP_URL: '{{ .Values.ldap.url | replace "spsh-xxx" .Release.Namespace }}' LDAP_BIND_DN: "{{ .Values.ldap.bindDN }}" + LDAP_OEFFENTLICHE_SCHULEN_DOMAIN: "{{ .Values.ldap.oeffentlicheSchulenDomain }}" + LDAP_ERSATZSCHULEN_DOMAIN: "{{ .Values.ldap.ersatzschulenDomain }}" diff --git a/automation/dbildungs-iam-server/values.yaml b/automation/dbildungs-iam-server/values.yaml index ce78d0601..3383ddddc 100644 --- a/automation/dbildungs-iam-server/values.yaml +++ b/automation/dbildungs-iam-server/values.yaml @@ -29,6 +29,8 @@ database: ldap: url: ldap://dbildungs-iam-ldap.spsh-xxx.svc.cluster.local bindDN: cn=admin,dc=schule-sh,dc=de + oeffentlicheSchulenDomain: schule-sh.de + ersatzschulenDomain: ersatzschule-sh.de auth: # existingSecret: Refers to a secret already present in the cluster, which is required. @@ -128,7 +130,7 @@ backend: # Reference: https://github.com/bitnami/charts/tree/main/bitnami/redis-cluster redis-cluster: enabled: true - persistence: + persistence: enabled: false size: 4Gi image: @@ -157,7 +159,7 @@ redis-cluster: podLabels: app.kubernetes.io/component: server-redis commonLabels: - app.kubernetes.io/name: dbildungs-iam-server + app.kubernetes.io/name: dbildungs-iam-server resources: limits: cpu: 300m @@ -167,14 +169,9 @@ redis-cluster: memory: 128Mi metrics: enabled: true - + autoscaling: enabled: false minReplicas: 1 maxReplicas: 5 - targetCPUUtilizationPercentage: 60 - -serviceMonitor: - enabled: true - path: "/api/metrics" - interval: 30s + targetCPUUtilizationPercentage: 60 \ No newline at end of file