From 37bff31f464a69707c9eba4941fa13d91509c4a5 Mon Sep 17 00:00:00 2001 From: dbildungs-iam-server-gha Date: Thu, 19 Dec 2024 14:11:53 +0000 Subject: [PATCH] dbildungs-iam-server --- automation/dbildungs-iam-server/Chart.yaml | 4 ++-- .../dbildungs-iam-server/config/config.json | 22 +++++++------------ .../templates/_dbildungs-iam-server-envs.tpl | 5 +++++ .../templates/configmap.yaml | 7 ++++++ .../templates/secret.yaml | 3 +++ automation/dbildungs-iam-server/values.yaml | 15 +++++++++++++ 6 files changed, 40 insertions(+), 16 deletions(-) diff --git a/automation/dbildungs-iam-server/Chart.yaml b/automation/dbildungs-iam-server/Chart.yaml index fb1f8548e..145f29b51 100644 --- a/automation/dbildungs-iam-server/Chart.yaml +++ b/automation/dbildungs-iam-server/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -appVersion: SPSH-1651 +appVersion: spsh-1574 description: dBildungs-IAM-server name: dbildungs-iam-server type: application -version: 0.0.0-spsh-1651-20241219-1407 +version: 0.0.0-spsh-1574-20241219-1410 diff --git a/automation/dbildungs-iam-server/config/config.json b/automation/dbildungs-iam-server/config/config.json index c2fac1396..99745ae08 100644 --- a/automation/dbildungs-iam-server/config/config.json +++ b/automation/dbildungs-iam-server/config/config.json @@ -30,11 +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" + "ADMIN_PASSWORD": "password", + "BASE_DN": "dc=schule-sh,dc=de" }, + "DATA": { "ROOT_ORGANISATION_ID": "d39cb7cf-2f9b-45f1-849f-973661f2f057" }, @@ -51,22 +54,10 @@ "BACKEND_FOR_FRONTEND_MODULE_LOG_LEVEL": "debug" }, "ITSLEARNING": { - "ENABLED": false, - "ENDPOINT": "https://itslearning.example.com", - "USERNAME": "username", - "PASSWORD": "password", "ROOT": "sh", "ROOT_OEFFENTLICH": "oeffentlich", "ROOT_ERSATZ": "ersatz" }, - "OX": { - "ENABLED": false, - "ENDPOINT": "https://ox_ip:ox_port/webservices/OXUserService", - "CONTEXT_ID": "1337", - "CONTEXT_NAME": "contextname", - "USERNAME": "username", - "PASSWORD": "password" - }, "PRIVACYIDEA": { "ENDPOINT": "http://localhost:5000", "USERNAME": "admin", @@ -75,7 +66,10 @@ "REALM": "defrealm" }, "IMPORT": { - "IMPORT_FILE_MAXGROESSE_IN_MB": 10 + "CSV_FILE_MAX_SIZE_IN_MB": 10, + "CSV_MAX_NUMBER_OF_USERS": 2000, + "PASSPHRASE_SECRET": "44abDqJk2qgwRbpGfO0VZx7DpXeFsm7R", + "PASSPHRASE_SALT": "YDp6fYkbUcj4ZkyAOnbAHGQ9O72htc5M" }, "SYSTEM": { "RENAME_WAITING_TIME_IN_SECONDS": 3, diff --git a/automation/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl b/automation/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl index 8ae0a3964..677d80464 100644 --- a/automation/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl +++ b/automation/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl @@ -91,4 +91,9 @@ secretKeyRef: name: {{ default .Values.auth.existingSecret .Values.auth.secretName }} key: redis-password +- name: OX_PASSWORD + valueFrom: + secretKeyRef: + name: {{ default .Values.auth.existingSecret .Values.auth.secretName }} + key: ox-password {{- end}} diff --git a/automation/dbildungs-iam-server/templates/configmap.yaml b/automation/dbildungs-iam-server/templates/configmap.yaml index 67068141c..4ddcd1b46 100644 --- a/automation/dbildungs-iam-server/templates/configmap.yaml +++ b/automation/dbildungs-iam-server/templates/configmap.yaml @@ -22,6 +22,11 @@ data: LDAP_OEFFENTLICHE_SCHULEN_DOMAIN: "{{ .Values.ldap.oeffentlicheSchulenDomain }}" LDAP_ERSATZSCHULEN_DOMAIN: "{{ .Values.ldap.ersatzschulenDomain }}" STATUS_REDIRECT_URL: "{{ .Values.status.url }}" + OX_ENABLED: "{{ .Values.ox.enabled }}" + OX_USERNAME: "{{ .Values.ox.username }}" + OX_ENDPOINT: "{{ .Values.ox.endpoint }}" + OX_CONTEXT_ID: "{{ .Values.ox.contextId }}" + OX_CONTEXT_NAME: "{{ .Values.ox.contextName }}" SYSTEM_RENAME_WAITING_TIME_IN_SECONDS: "{{ .Values.backend.env.renameWaitingTimeInSeconds }}" SYSTEM_STEP_UP_TIMEOUT_ENABLED: "{{ .Values.backend.env.stepUpTimeoutEnabled }}" SYSTEM_STEP_UP_TIMEOUT_IN_SECONDS: "{{ .Values.backend.env.stepUpTimeoutInSeconds }}" @@ -29,3 +34,5 @@ data: ITSLEARNING_ROOT_OEFFENTLICH: '{{ .Values.itslearning.rootOeffentlich }}' ITSLEARNING_ROOT_ERSATZ: '{{ .Values.itslearning.rootErsatz }}' NODE_OPTIONS: "--max-old-space-size={{ .Values.backend.env.maxOldSpaceSize }}" + IMPORT_CSV_FILE_MAX_SIZE_IN_MB: '{{ .Values.import.csvFileMaxSizeInMB }}' + IMPORT_CSV_MAX_NUMBER_OF_USERS: '{{ .Values.import.csvMaxNumberOfUsers }}' diff --git a/automation/dbildungs-iam-server/templates/secret.yaml b/automation/dbildungs-iam-server/templates/secret.yaml index 4b0c37d22..a28314969 100644 --- a/automation/dbildungs-iam-server/templates/secret.yaml +++ b/automation/dbildungs-iam-server/templates/secret.yaml @@ -30,4 +30,7 @@ data: vidis-region-name: {{ .Values.auth.vidis_region_name }} vidis-keycloak-group: {{ .Values.auth.vidis_keycloak_group }} vidis-keycloak-role: {{ .Values.auth.vidis_keycloak_role }} + import-passphrase-secret: {{ .Values.auth.import_passphrase_secret }} + import-passphrase-salt: {{ .Values.auth.import_passphrase_salt }} + ox-password: {{ .Values.auth.ox_password }} {{- end }} diff --git a/automation/dbildungs-iam-server/values.yaml b/automation/dbildungs-iam-server/values.yaml index 889ee89ba..4daf0f153 100644 --- 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 @@ -64,6 +65,16 @@ auth: vidis_region_name: '' vidis_keycloak_group: '' vidis_keycloak_role: '' + import_passphrase_secret: '' + import_passphrase_salt: '' + ox_password: '' + +ox: + enabled: false + username: 'oxadmin' + endpoint: 'https://webmail.example.com' + contextId: '10' + contextName: '10' backend: replicaCount: 1 @@ -193,3 +204,7 @@ cronjobs: endpoint: '/api/cron/unlock' httpMethod: 'PUT' script: 'cron_trigger.sh' + +import: + csvFileMaxSizeInMB: 10 + csvMaxNumberOfUsers: 2000