From 6d3ad05c443e2f28319d9978de8518dc52b51a20 Mon Sep 17 00:00:00 2001 From: dbildungs-iam-server-gha Date: Tue, 17 Dec 2024 07:52:22 +0000 Subject: [PATCH] dbildungs-iam-server --- automation/dbildungs-iam-server/Chart.yaml | 4 ++-- .../dbildungs-iam-server/config/config.json | 17 ----------------- .../templates/_dbildungs-iam-server-envs.tpl | 5 +++++ .../templates/backend-deployment.yaml | 2 +- .../templates/configmap.yaml | 5 +++++ .../dbildungs-iam-server/templates/secret.yaml | 3 ++- automation/dbildungs-iam-server/values.yaml | 8 ++++++++ 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/automation/dbildungs-iam-server/Chart.yaml b/automation/dbildungs-iam-server/Chart.yaml index c47bea767..4a5f82c60 100644 --- a/automation/dbildungs-iam-server/Chart.yaml +++ b/automation/dbildungs-iam-server/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -appVersion: SPSH-1034 +appVersion: SPSH-1393 description: dBildungs-IAM-server name: dbildungs-iam-server type: application -version: 0.0.0-spsh-1034-20241217-0746 +version: 0.0.0-spsh-1393-20241217-0751 diff --git a/automation/dbildungs-iam-server/config/config.json b/automation/dbildungs-iam-server/config/config.json index c2fac1396..17cb5d368 100644 --- a/automation/dbildungs-iam-server/config/config.json +++ b/automation/dbildungs-iam-server/config/config.json @@ -30,11 +30,6 @@ "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" }, @@ -51,22 +46,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", 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 f848b2f9e..b911656c5 100644 --- a/automation/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl +++ b/automation/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl @@ -121,4 +121,9 @@ secretKeyRef: name: {{ default .Values.auth.existingSecret .Values.auth.secretName }} key: vidis-keycloak-role + - 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/backend-deployment.yaml b/automation/dbildungs-iam-server/templates/backend-deployment.yaml index 0c5b14b06..b36630482 100644 --- a/automation/dbildungs-iam-server/templates/backend-deployment.yaml +++ b/automation/dbildungs-iam-server/templates/backend-deployment.yaml @@ -44,7 +44,7 @@ spec: securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }} command: [ "node", "dist/src/console/main.js", "keycloak", "update-clients", "dev" ] env: - {{- include "dbildungs-iam-server-backend-envs" . | indent 12 }} + {{- include "dbildungs-iam-server-backend-envs" . | indent 12 }} {{- if .Values.backend.extraEnvVars }} {{ toYaml .Values.backend.extraEnvVars | nindent 12 }} {{- end }} diff --git a/automation/dbildungs-iam-server/templates/configmap.yaml b/automation/dbildungs-iam-server/templates/configmap.yaml index 6603a8e9f..eb769795d 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 }}" diff --git a/automation/dbildungs-iam-server/templates/secret.yaml b/automation/dbildungs-iam-server/templates/secret.yaml index 4b0c37d22..68a57d6f3 100644 --- a/automation/dbildungs-iam-server/templates/secret.yaml +++ b/automation/dbildungs-iam-server/templates/secret.yaml @@ -30,4 +30,5 @@ 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 }} -{{- end }} + ox-password: {{ .Values.auth.ox_password }} +{{- end }} \ No newline at end of file diff --git a/automation/dbildungs-iam-server/values.yaml b/automation/dbildungs-iam-server/values.yaml index b175bda68..1c74fcde1 100644 --- a/automation/dbildungs-iam-server/values.yaml +++ b/automation/dbildungs-iam-server/values.yaml @@ -64,6 +64,14 @@ auth: vidis_region_name: '' vidis_keycloak_group: '' vidis_keycloak_role: '' + ox_password: '' + +ox: + enabled: false + username: '' + endpoint: '' + contextId: '' + contextName: '' backend: replicaCount: 1