From 11362e0202e237a97f099f5fffffcc73e6e8ced0 Mon Sep 17 00:00:00 2001
From: dbildungs-iam-server-gha <dbildungs-iam-server@dbildungsplattform.de>
Date: Mon, 13 Jan 2025 08:47:33 +0000
Subject: [PATCH] dbildungs-iam-server

---
 automation/dbildungs-iam-server/Chart.yaml    |  4 +--
 .../templates/_dbildungs-iam-server-envs.tpl  |  5 ---
 .../templates/backend-ingress.yaml            | 34 -------------------
 .../templates/secret.yaml                     |  1 -
 automation/dbildungs-iam-server/values.yaml   |  2 --
 5 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/automation/dbildungs-iam-server/Chart.yaml b/automation/dbildungs-iam-server/Chart.yaml
index 398121fe7..348d3c2f3 100644
--- a/automation/dbildungs-iam-server/Chart.yaml
+++ b/automation/dbildungs-iam-server/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
-appVersion: dbp-1132
+appVersion: spsh-1705
 description: dBildungs-IAM-server
 name: dbildungs-iam-server
 type: application
-version: 0.0.0-dbp-1132-20250113-0828
+version: 0.0.0-spsh-1705-20250113-0846
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 0e27680e3..c6d1f8865 100644
--- a/automation/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl
+++ b/automation/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl
@@ -126,9 +126,4 @@
     secretKeyRef:
         name: {{ default .Values.auth.existingSecret .Values.auth.secretName }}
         key: vidis-keycloak-role
-- name: METRICS_BASIC_AUTH
-  valueFrom:
-    secretKeyRef:
-        name: {{ default .Values.auth.existingSecret .Values.auth.secretName }}
-        key: auth
 {{- end}}
diff --git a/automation/dbildungs-iam-server/templates/backend-ingress.yaml b/automation/dbildungs-iam-server/templates/backend-ingress.yaml
index 791cb465f..4a324e728 100644
--- a/automation/dbildungs-iam-server/templates/backend-ingress.yaml
+++ b/automation/dbildungs-iam-server/templates/backend-ingress.yaml
@@ -30,38 +30,4 @@ spec:
                 port:
                   number: {{ $.Values.backend.service.ports.http }}
           {{- end }}
-{{ end }}
----
-{{if .Values.backend.ingress.healthenabled }}
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: {{ template "common.names.name" . }}-health-backend
-  namespace: {{ template "common.names.namespace" . }}
-  labels:
-    {{- include "common.labels" . | nindent 4 }}
-  annotations:
-    nginx.ingress.kubernetes.io/rewrite-target: /health
-    nginx.ingress.kubernetes.io/auth-type: basic
-    nginx.ingress.kubernetes.io/auth-secret: {{ .Values.auth.secretName }}
-    nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required - user'    
-    {{- with .Values.backend.ingress.annotations }}
-    {{- toYaml . | nindent 4 }}
-    {{- end }}
-spec:
-  tls:
-  - hosts:
-      - {{ .Values.backendHostname  }}
-  ingressClassName: {{ .Values.backend.ingress.ingressClassName }}
-  rules:
-    - host: {{ .Values.backendHostname }}
-      http:
-        paths:
-          - path: /api/health
-            pathType: Prefix
-            backend:
-              service:
-                name: {{ template "common.names.name" $ }}-backend
-                port:
-                  number: {{ $.Values.backend.service.ports.http }}
 {{ end }}
\ No newline at end of file
diff --git a/automation/dbildungs-iam-server/templates/secret.yaml b/automation/dbildungs-iam-server/templates/secret.yaml
index 463f98466..a28314969 100644
--- a/automation/dbildungs-iam-server/templates/secret.yaml
+++ b/automation/dbildungs-iam-server/templates/secret.yaml
@@ -33,5 +33,4 @@ data:
   import-passphrase-secret: {{ .Values.auth.import_passphrase_secret }}
   import-passphrase-salt: {{ .Values.auth.import_passphrase_salt }}
   ox-password: {{ .Values.auth.ox_password }}
-  auth: {{ .Values.auth.basic_auth_password }}
 {{- end }}
diff --git a/automation/dbildungs-iam-server/values.yaml b/automation/dbildungs-iam-server/values.yaml
index eb452e604..6a9b00ee0 100644
--- a/automation/dbildungs-iam-server/values.yaml
+++ b/automation/dbildungs-iam-server/values.yaml
@@ -68,7 +68,6 @@ auth:
   import_passphrase_secret: ''
   import_passphrase_salt: ''
   ox_password: ''
-  basic_auth_password: ''
 
 ox:
   enabled: false
@@ -122,7 +121,6 @@ backend:
     # Only enable if 2nd host name is defined
     enabled2nd: false
     enabled: true
-    healthenabled: true
     ingressClassName: nginx
     pathType: Prefix
     portnumber: 80