Merge branch 'add_multiple_ingresses' into 'main'

add configuration for multiple ingresses

See merge request hifis-technical-platform/helm-charts!2

hifiscp/Chart.yaml

 apiVersion: v1
 name: hifiscp
-version: 0.0.1
+version: 0.0.2
 description: A Helm chart to deploy the HIFIS Cloud Portal Backend and Frontend
 keywords:
   - HIFIS

hifiscp/templates/ingress.yaml

-{{- if .Values.ingress.enabled -}}
 {{- $fullName := include "hifiscp.fullname" . -}}
-{{- $contextPath := .Values.ingress.contextPath -}}
+{{- $name := include "hifiscp.name" . -}}
+{{- $chart := include "hifiscp.chart" . -}}
+{{- $release := .Release.Name -}}
+{{- $heritage := .Release.Service -}}
+{{- range .Values.ingress }}
+{{- $contextPath := .contextPath }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ template "hifiscp.fullname" . }}
+  name: {{ $fullName }}-{{ .name }}
   labels:
-    app: {{ template "hifiscp.name" . }}
-    chart: {{ template "hifiscp.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app: {{ $name }}
+    chart: {{ $chart }}
+    release: {{ $release }}
+    heritage: {{ $heritage }}
   annotations:
-{{- with .Values.ingress.annotations }}
+{{- with .annotations }}
 {{ toYaml . | indent 4 }}
 {{- end }}
 spec:
-{{- if .Values.ingress.tls }}
+{{- if .tls }}
   tls:
-  {{- range .Values.ingress.tls }}
+  {{- range .tls }}
     - hosts:
       {{- range .hosts }}
         - {{ . | quote }}
@@ -26,30 +30,30 @@ spec:
   {{- end }}
 {{- end }}
   rules:
-  {{- range .Values.ingress.hosts }}
+  {{- range .hosts }}
     - host: {{ . | quote }}
       http:
         paths:
-          - path: {{ $contextPath }}
+          - path: /
             pathType: ImplementationSpecific
             backend:
               service:
                 name: {{ $fullName }}-webapp
                 port:
                   number: 80
-          - path: {{ $contextPath }}api
+          - path: api
             pathType: ImplementationSpecific
             backend:
               service:
                 name: {{ $fullName }}-cerebrum
                 port:
                   number: 80
-          - path: {{ $contextPath }}swagger-ui
+          - path: swagger-ui
             pathType: ImplementationSpecific
             backend:
               service:
-                name: {{ $fullName }}-cerebrum
+                name: cerebrum
                 port:
                   number: 80
   {{- end }}
-{{- end }}
+{{- end }}
\ No newline at end of file

hifiscp/values.yaml

@@ -74,9 +74,9 @@ webapp:
   affinity: {}
 
 ingress:
-  enabled: true
-  contextPath: "/"
-  annotations: {}
-  hosts: 
-     - hifis.cloud.portal
-  tls: []
\ No newline at end of file
+  - name: "host1"
+    contextPath: "/"
+    annotations: {}
+    hosts:
+    - hifis.cloud.portal
+    tls: []
\ No newline at end of file