dbildungs-iam-server

dBildungsplattform · Dec 20, 2024 · 5bea236 · 5bea236
1 parent 34c58f3
commit 5bea236
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 8 deletions.
diff --git a/automation/dbildungs-iam-server/Chart.yaml b/automation/dbildungs-iam-server/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: DBP-1204
+appVersion: sha-ed39bc5
 description: dBildungs-IAM-server
 name: dbildungs-iam-server
 type: application
-version: 0.0.0-dbp-1204-20241220-1709
+version: 0.0.1-20241220-1739
diff --git a/automation/dbildungs-iam-server/config/config.json b/automation/dbildungs-iam-server/config/config.json
@@ -30,6 +30,14 @@
     "PASSWORD": "",
     "USE_TLS": false
   },
+
+  "LDAP": {
+    "URL": "ldap://spsh-xxx.svc.cluster.local",
+    "BIND_DN": "cn=admin,dc=schule-sh,dc=de",
+    "ADMIN_PASSWORD": "password",
+    "BASE_DN": "dc=schule-sh,dc=de"
+  },
+
   "DATA": {
     "ROOT_ORGANISATION_ID": "d39cb7cf-2f9b-45f1-849f-973661f2f057"
   },

diff --git a/automation/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl b/automation/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl
@@ -96,4 +96,34 @@
     secretKeyRef:
         name: {{ default .Values.auth.existingSecret .Values.auth.secretName }}
         key: ox-password
+- name: VIDIS_BASE_URL
+  valueFrom:
+    secretKeyRef:
+        name: {{ default .Values.auth.existingSecret .Values.auth.secretName }}
+        key: vidis-base-url
+- name: VIDIS_USERNAME
+  valueFrom:
+    secretKeyRef:
+        name: {{ default .Values.auth.existingSecret .Values.auth.secretName }}
+        key: vidis-username
+- name: VIDIS_PASSWORD
+  valueFrom:
+    secretKeyRef:
+        name: {{ default .Values.auth.existingSecret .Values.auth.secretName }}
+        key: vidis-password
+- name: VIDIS_REGION_NAME
+  valueFrom:
+    secretKeyRef:
+        name: {{ default .Values.auth.existingSecret .Values.auth.secretName }}
+        key: vidis-region-name
+- name: VIDIS_KEYCLOAK_GROUP
+  valueFrom:
+    secretKeyRef:
+        name: {{ default .Values.auth.existingSecret .Values.auth.secretName }}
+        key: vidis-keycloak-group
+- name: VIDIS_KEYCLOAK_ROLE
+  valueFrom:
+    secretKeyRef:
+        name: {{ default .Values.auth.existingSecret .Values.auth.secretName }}
+        key: vidis-keycloak-role
 {{- end}}
diff --git a/automation/dbildungs-iam-server/templates/backend-deployment.yaml b/automation/dbildungs-iam-server/templates/backend-deployment.yaml
@@ -10,11 +10,6 @@ spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.backend.replicaCount }}
   {{- end }}
-  strategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxUnavailable: 50%
-      maxSurge: 50%
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ template "common.names.name" . }}

diff --git a/automation/dbildungs-iam-server/values.yaml b/automation/dbildungs-iam-server/values.yaml
@@ -33,6 +33,7 @@ ldap:
   bindDN: cn=admin,dc=schule-sh,dc=de
   oeffentlicheSchulenDomain: schule-sh.de
   ersatzschulenDomain: ersatzschule-sh.de
+  base_dn: dc=schule-sh,dc=de
 
 itslearning:
   root: sh
@@ -165,7 +166,7 @@ autoscaling:
 
 podDisruptionBudget:
   enabled: true
-  minAvailable: "60%"
+  minAvailable: "80%"
 
 status:
   url: 'https://status.dev.spsh.dbildungsplattform.de/'
@@ -203,6 +204,11 @@ cronjobs:
       endpoint: '/api/cron/unlock'
       httpMethod: 'PUT'
       script: 'cron_trigger.sh'
+    cron-trigger-5:
+      schedule: 30 0 * * *
+      endpoint: '/api/cron/vidis-angebote'
+      httpMethod: 'PUT'
+      script: 'cron_trigger.sh'
 
 import:
   csvFileMaxSizeInMB: 10