Merge branch 'SPSH-1654' of https://github.com/dBildungsplattform/dbi…

…ldungs-iam-server into SPSH-1654
dBildungsplattform · Jan 13, 2025 · b3fda2d · b3fda2d
2 parents 6a5e018 + a50801d
commit b3fda2d
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 0 deletions.
diff --git a/charts/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl b/charts/dbildungs-iam-server/templates/_dbildungs-iam-server-envs.tpl
@@ -126,4 +126,9 @@
     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/charts/dbildungs-iam-server/templates/backend-ingress.yaml b/charts/dbildungs-iam-server/templates/backend-ingress.yaml
@@ -30,4 +30,38 @@ 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 }}
diff --git a/charts/dbildungs-iam-server/templates/secret.yaml b/charts/dbildungs-iam-server/templates/secret.yaml
@@ -33,4 +33,5 @@ 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/charts/dbildungs-iam-server/values.yaml b/charts/dbildungs-iam-server/values.yaml
@@ -68,6 +68,7 @@ auth:
   import_passphrase_secret: ''
   import_passphrase_salt: ''
   ox_password: ''
+  basic_auth_password: ''
 
 ox:
   enabled: false
@@ -121,6 +122,7 @@ backend:
     # Only enable if 2nd host name is defined
     enabled2nd: false
     enabled: true
+    healthenabled: true
     ingressClassName: nginx
     pathType: Prefix
     portnumber: 80