diff --git a/automation/dbildungs-iam-server/Chart.yaml b/automation/dbildungs-iam-server/Chart.yaml index 5f0ee6e8f..89fd8d47c 100644 --- a/automation/dbildungs-iam-server/Chart.yaml +++ b/automation/dbildungs-iam-server/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -appVersion: SPSH-1393 +appVersion: SPSH-1574 description: dBildungs-IAM-server name: dbildungs-iam-server type: application -version: 0.0.0-spsh-1393-20241218-0808 +version: 0.0.0-spsh-1574-20241218-0821 diff --git a/automation/dbildungs-iam-server/config/config.json b/automation/dbildungs-iam-server/config/config.json index 496e4f45b..fe0c083bf 100644 --- a/automation/dbildungs-iam-server/config/config.json +++ b/automation/dbildungs-iam-server/config/config.json @@ -30,6 +30,11 @@ "PASSWORD": "", "USE_TLS": false }, + "LDAP": { + "URL": "ldap://spsh-xxx.svc.cluster.local", + "BIND_DN": "cn=admin,dc=schule-sh,dc=de", + "ADMIN_PASSWORD": "password" + }, "DATA": { "ROOT_ORGANISATION_ID": "d39cb7cf-2f9b-45f1-849f-973661f2f057" }, @@ -46,10 +51,22 @@ "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", 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 677d80464..8ae0a3964 100644 --- a/automation/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl +++ b/automation/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl @@ -91,9 +91,4 @@ 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 4ddcd1b46..efd132aeb 100644 --- a/automation/dbildungs-iam-server/templates/configmap.yaml +++ b/automation/dbildungs-iam-server/templates/configmap.yaml @@ -22,11 +22,6 @@ 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 }}" diff --git a/automation/dbildungs-iam-server/templates/secret.yaml b/automation/dbildungs-iam-server/templates/secret.yaml index a28314969..1083931d2 100644 --- a/automation/dbildungs-iam-server/templates/secret.yaml +++ b/automation/dbildungs-iam-server/templates/secret.yaml @@ -32,5 +32,4 @@ data: 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 327cd1398..064890176 100644 --- a/automation/dbildungs-iam-server/values.yaml +++ b/automation/dbildungs-iam-server/values.yaml @@ -66,14 +66,6 @@ auth: 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