fix: make the legacy services flag work

Author: olevski

helm-chart/renku/templates/ingress.yaml

@@ -2,18 +2,12 @@
 {{- $keycloakEnabled := .Values.keycloakx.enabled -}}
 {{- $keycloakFullname := include "keycloak.fullname" . -}}
 {{- $keycloakServicePort := .Values.keycloakx.ingress.servicePort -}}
-{{- $gitlabFullname := include "gitlab.fullname" . -}}
-{{- $gitlabServicePort := 80 -}}
 {{- $uiFullname := include "ui.fullname" . -}}
 {{- $uiServicePort := .Values.ui.client.service.port -}}
 {{- $uiserverFullname := include "uiserver.fullname" . -}}
 {{- $uiserverServicePort := .Values.ui.server.service.port -}}
-{{- $webhookServiceFullname := include "renku.graph.webhookService.fullname" . -}}
-{{- $knowledgeGraphFullname := include "renku.graph.knowledgeGraph.fullname" . -}}
 {{- $searchApiFullname := include "renku.search.searchApi.fullname" . -}}
 {{- $renkuFullname := include "renku.fullname" . -}}
-{{- $jenaFullname := include "renku-jena.fullname" . -}}
-{{- $jenaServicePort := .Values.jena.service.port -}}
 {{- $swaggerEnabled := .Values.swagger.enabled -}}
 ---
 apiVersion: networking.k8s.io/v1
@@ -59,53 +53,54 @@ spec:
             port:
               name: {{ $keycloakServicePort }}
       {{- end }}
-      - path: /gitlab
+      - path: /api
         pathType: Prefix
         backend:
           service:
             name: {{ template "renku.fullname" $ }}-gateway
             port:
               number: 80
-      - path: /repos
+      - path: /
         pathType: Prefix
         backend:
           service:
-            name: {{ template "renku.fullname" $ }}-gateway
+            name: {{ $uiFullname }}
             port:
-              number: 80
-      - path: /api
+              number: {{ $uiServicePort }}
+      - path: /ui-server
         pathType: Prefix
         backend:
           service:
             name: {{ template "renku.fullname" $ }}-gateway
             port:
-              number: 80
-      - path: /entities
+              number: {{ $uiserverServicePort }}
+      {{- if $.Values.enableV1Services }}
+      - path: /gitlab
         pathType: Prefix
         backend:
           service:
             name: {{ template "renku.fullname" $ }}-gateway
             port:
               number: 80
-      - path: /
+      - path: /repos
         pathType: Prefix
         backend:
           service:
-            name: {{ $uiFullname }}
+            name: {{ template "renku.fullname" $ }}-gateway
             port:
-              number: {{ $uiServicePort }}
-      - path: /ui-server
+              number: 80
+      - path: /entities
         pathType: Prefix
         backend:
           service:
             name: {{ template "renku.fullname" $ }}-gateway
             port:
-              number: {{ $uiserverServicePort }}
+              number: 80
       - path: /webhooks/events
         pathType: Prefix
         backend:
           service:
-            name: {{ $webhookServiceFullname }}
+            name: {{ template "renku.graph.webhookService.fullname" $ }}
             port:
               number: 80
       - path: /knowledge-graph
@@ -115,6 +110,7 @@ spec:
             name: {{ template "renku.fullname" $ }}-gateway
             port:
               number: 80
+      {{- end }}
       {{- if $swaggerEnabled }}
       - path: /swagger
         pathType: Prefix