diff --git a/automation/dbildungs-iam-server/Chart.lock b/automation/dbildungs-iam-server/Chart.lock index 39ac8d24c..ca581b56b 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-19T15:45:59.670759627Z" +generated: "2024-11-19T15:58:58.675584949Z" diff --git a/automation/dbildungs-iam-server/Chart.yaml b/automation/dbildungs-iam-server/Chart.yaml index 930c03c29..d79be51a7 100644 --- a/automation/dbildungs-iam-server/Chart.yaml +++ b/automation/dbildungs-iam-server/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: SPSH-941 +appVersion: SPSH-1288 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-941-20241119-1545 +version: 0.0.0-spsh-1288-20241119-1558 diff --git a/automation/dbildungs-iam-server/config/config.json b/automation/dbildungs-iam-server/config/config.json index d54f4499d..aaeb6b093 100644 --- a/automation/dbildungs-iam-server/config/config.json +++ b/automation/dbildungs-iam-server/config/config.json @@ -77,10 +77,5 @@ }, "IMPORT": { "IMPORT_FILE_MAXGROESSE_IN_MB": 10 - }, - "SYSTEM": { - "RENAME_WAITING_TIME_IN_SECONDS": 3, - "STEP_UP_TIMEOUT_ENABLED": true, - "STEP_UP_TIMEOUT_IN_SECONDS": 10 } } 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 e22a1bd7e..e6b03a7fd 100644 --- a/automation/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl +++ b/automation/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl @@ -86,21 +86,11 @@ secretKeyRef: name: {{ default .Values.auth.existingSecret .Values.auth.secretName }} key: pi-user-realm - - name: SYSTEM_RENAME_WAITING_TIME_IN_SECONDS + - name: PI_RENAME_WAITING_TIME valueFrom: secretKeyRef: name: {{ default .Values.auth.existingSecret .Values.auth.secretName }} - key: system-rename-waiting-time-in-seconds - - name: SYSTEM_STEP_UP_TIMEOUT_IN_SECONDS - valueFrom: - secretKeyRef: - name: {{ default .Values.auth.existingSecret .Values.auth.secretName }} - key: system-step-up-timeout-in-seconds - - name: SYSTEM_STEP_UP_TIMEOUT_ENABLED - valueFrom: - secretKeyRef: - name: {{ default .Values.auth.existingSecret .Values.auth.secretName }} - key: system-step-up-timeout-enabled + key: pi-rename-waiting-time - name: REDIS_PASSWORD valueFrom: secretKeyRef: diff --git a/automation/dbildungs-iam-server/templates/secret.yaml b/automation/dbildungs-iam-server/templates/secret.yaml index d87bfe75d..51e46f34b 100644 --- a/automation/dbildungs-iam-server/templates/secret.yaml +++ b/automation/dbildungs-iam-server/templates/secret.yaml @@ -22,9 +22,7 @@ data: pi-admin-password: {{ .Values.auth.pi_admin_password }} pi-user-resolver: {{ .Values.auth.pi_user_resolver }} pi-user-realm: {{ .Values.auth.pi_user_realm }} - system-rename-waiting-time-in-seconds: {{ .Values.auth.system_rename_waiting_time_in_seconds }} - system-step-up-timeout-in-seconds: {{ .Values.auth.system_step_up_timeout_in_seconds }} - system-step-up-enabled: {{ .Values.auth.system_step_up_enabled }} + pi-rename-waiting-time: {{ .Values.auth.pi_rename_waiting_time }} secrets-json: {{ .Values.auth.secrets_json }} redis-password: {{ .Values.auth.redis_password }} {{- end }} diff --git a/automation/dbildungs-iam-server/values.yaml b/automation/dbildungs-iam-server/values.yaml index a7eced125..32331b899 100644 --- a/automation/dbildungs-iam-server/values.yaml +++ b/automation/dbildungs-iam-server/values.yaml @@ -48,9 +48,7 @@ auth: pi_admin_password: '' pi_user_resolver: '' pi_user_realm: '' - system_rename_waiting_time_in_seconds: '' - system_step_up_timeout_in_seconds: '' - system_step_up_timeout_enabled: '' + pi_rename_waiting_time: '' redis_password: '' backend: @@ -130,7 +128,7 @@ backend: # Reference: https://github.com/bitnami/charts/tree/main/bitnami/redis-cluster redis-cluster: enabled: true - persistence: + persistence: enabled: false size: 4Gi image: @@ -159,7 +157,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 @@ -169,9 +167,9 @@ redis-cluster: memory: 128Mi metrics: enabled: true - + autoscaling: enabled: false minReplicas: 1 maxReplicas: 5 - targetCPUUtilizationPercentage: 60 + targetCPUUtilizationPercentage: 60 \ No newline at end of file