fix: make the legacy services flag work (#4067)

Author: olevski

helm-chart/renku/requirements.yaml

@@ -19,6 +19,7 @@ dependencies:
   - name: amalthea
     repository: "https://swissdatasciencecenter.github.io/helm-charts/"
     version: "0.19.1"
+    condition: enableV1Services
   - name: amalthea-sessions
     repository: "https://swissdatasciencecenter.github.io/helm-charts/"
     version: "0.19.1"

helm-chart/renku/templates/data-service/rbac_k8s_watcher.yaml

@@ -9,6 +9,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 rules:
+  {{- if .Values.enableV1Services }}
   - apiGroups:
       - {{ .Values.amalthea.crdApiGroup }}
     resources:
@@ -21,6 +22,7 @@ rules:
       - list
       - get
       - watch
+  {{- end }}
   - apiGroups:
       - amalthea.dev
     resources:

helm-chart/renku/templates/ingress.yaml

@@ -2,17 +2,11 @@
 {{- $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" . -}}
 {{- $renkuFullname := include "renku.fullname" . -}}
-{{- $jenaFullname := include "renku-jena.fullname" . -}}
-{{- $jenaServicePort := .Values.jena.service.port -}}
 {{- $swaggerEnabled := .Values.swagger.enabled -}}
 ---
 apiVersion: networking.k8s.io/v1
@@ -58,53 +52,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
@@ -114,6 +109,7 @@ spec:
             name: {{ template "renku.fullname" $ }}-gateway
             port:
               number: 80
+      {{- end }}
       {{- if $swaggerEnabled }}
       - path: /swagger
         pathType: Prefix

helm-chart/renku/templates/network-policies.yaml

@@ -38,6 +38,7 @@ spec:
             matchLabels:
               kubernetes.io/metadata.name: {{ .Release.Namespace }}
         {{- end }}
+        {{- if .Values.enableV1Services }}
         - podSelector:
             matchLabels:
               app: event-log
@@ -56,6 +57,7 @@ spec:
           namespaceSelector:
             matchLabels:
               kubernetes.io/metadata.name: {{ .Release.Namespace }}
+        {{- end }}
         - podSelector:
             matchLabels:
               app: post-install-postgres
@@ -288,6 +290,7 @@ spec:
       ports:
         - protocol: TCP
           port: http
+{{- if .Values.enableV1Services }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -366,6 +369,7 @@ spec:
       ports:
         - protocol: TCP
           port: http-kg
+{{- end }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -467,6 +471,7 @@ spec:
         - protocol: TCP
           port: http
 {{- end }}
+{{- if .Values.enableV1Services }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -491,6 +496,7 @@ spec:
       ports:
         - protocol: TCP
           port: http-webhook-sv
+{{- end }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -546,6 +552,7 @@ spec:
           port: http
         - protocol: TCP
           port: grpc
+{{- if .Values.enableV1Services }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -571,6 +578,7 @@ spec:
       ports:
         - protocol: TCP
           port: http
+{{- end }}
 {{- if .Values.redis.install }}
 ---
 apiVersion: networking.k8s.io/v1
@@ -713,6 +721,7 @@ spec:
     - from:
         - ipBlock:
             cidr: 0.0.0.0/0
+{{- if .Values.enableV1Services }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -925,6 +934,7 @@ spec:
       ports:
         - protocol: TCP
           port: http
+{{- end }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -954,6 +964,7 @@ spec:
       ports:
         - protocol: TCP
           port: http
+{{- if .Values.enableV1Services }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -982,6 +993,7 @@ spec:
       ports:
         - protocol: TCP
           port: http
+{{- end }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -1009,6 +1021,7 @@ spec:
       ports:
         - protocol: TCP
           port: http
+{{- if .Values.enableV1Services }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
@@ -1053,6 +1066,7 @@ spec:
       app.kubernetes.io/name: amalthea
   policyTypes:
   - Egress
+{{- end }}
 ---
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy

helm-chart/renku/templates/notebooks/deployment.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.enableV1Services }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -117,3 +118,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+{{- end }}

helm-chart/renku/templates/tests/test-renku.yaml

@@ -1,4 +1,5 @@
 {{ if .Values.tests.enabled -}}
+{{ if .Values.enableV1Services -}}
 apiVersion: v1
 kind: Pod
 metadata:
@@ -85,3 +86,4 @@ spec:
     resources:
 {{ toYaml .Values.tests.resources | indent 6 }}
 {{- end }}
+{{- end }}