fix /grafana path

Author: 7va

helm/templates/ingress.yaml

@@ -2,38 +2,40 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: {{ include "opensampl.fullname" . }}
+  name: {{ include "opensampl.fullname" . }}-ingress
+  labels:
+    {{- include "opensampl.labels" . | nindent 4 }}
+  {{- with .Values.ingress.annotations }}
   annotations:
-    {{- toYaml .Values.ingress.annotations | nindent 4 }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 spec:
+  {{- if .Values.ingress.className }}
   ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
   tls:
-    {{- toYaml .Values.ingress.tls | nindent 4 }}
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
   rules:
-    - host: {{ (index .Values.ingress.hosts 0).host }}
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
       http:
         paths:
-          - path: /api(/|$)(.*)
-            pathType: Prefix
+          {{- range .paths }}
+          - path: {{ .path }}
+            pathType: {{ .pathType }}
             backend:
               service:
-                name: {{ include "opensampl.fullname" . }}-backend
+                name: {{ include "opensampl.fullname" $ }}-{{ .service }}
                 port:
-                  number: {{ .Values.backend.service.port }}
-
-          - path: /grafana(/|$)(.*)
-            pathType: Prefix
-            backend:
-              service:
-                name: {{ include "opensampl.fullname" . }}-grafana
-                port:
-                  number: {{ .Values.grafana.port }}
-
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: {{ include "opensampl.fullname" . }}-backend
-                port:
-                  number: {{ .Values.backend.service.port }}
-{{- end }}
+                  number: {{ if eq .service "backend" }}{{ $.Values.backend.service.port }}{{ else }}{{ $.Values.grafana.port }}{{ end }}
+          {{- end }}
+    {{- end }}
+{{- end }}

helm/values-mariner.yaml

@@ -59,9 +59,6 @@ ingress:
       - path: /grafana
         pathType: Prefix
         service: grafana
-      - path: /api
-        pathType: prefix
-        service: backend
       - path: /docs
         pathType: Prefix
         service: backend