From 1996bbf3b22cee5de85ffed701bc6849bcbbc493 Mon Sep 17 00:00:00 2001
From: Tasko Olevski <tasko.olevski@sdsc.ethz.ch>
Date: Thu, 18 Jan 2024 23:47:05 +0100
Subject: [PATCH] squashme: minor fix

---
 helm-chart/renku/templates/gateway/config.yaml           | 9 +++++----
 .../renku/templates/gateway/deployment-revproxy.yaml     | 4 ++--
 helm-chart/renku/templates/ingress.yaml                  | 8 ++++----
 helm-chart/renku/templates/notebooks/statefulset.yaml    | 2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/helm-chart/renku/templates/gateway/config.yaml b/helm-chart/renku/templates/gateway/config.yaml
index d281aee04a..c0b2d5ebe4 100644
--- a/helm-chart/renku/templates/gateway/config.yaml
+++ b/helm-chart/renku/templates/gateway/config.yaml
@@ -32,7 +32,8 @@ data:
           serviceNames: {{ template "gateway.core.serviceNames" . }}
           servicePaths: {{ template "gateway.core.paths" . }}
           sticky: true 
-        crc: {{ printf "http://%s-data-service" .Release.Name | quote }}
+        dataService: {{ printf "http://%s-data-service" .Release.Name | quote }}
+        keycloak: {{ include "renku.keycloakUrl" . | quote }} 
     login:
       endpointsBasePath: "/api/auth" 
       defaultAppRedirectURL: {{ include "renku.baseUrl" . | quote }}
@@ -41,21 +42,21 @@ data:
       providers:
         renku:
           default: true
-          issuer: {{ printf "%s/realms/%s" (include "renku.keycloakUrl" .) (include renku.keycloak.realm .) }}
+          issuer: {{ printf "%s/realms/%s" (include "renku.keycloakUrl" .) (include "renku.keycloak.realm" .) }}
           clientID: renku
           scopes: []
           callbackURI:  {{ printf "%s/api/auth/callback" (include "renku.baseUrl" .) }}
           usePKCE: false
         renku-cli:
           default: false
-          issuer: {{ printf "%s/realms/%s" (include "renku.keycloakUrl" .) (include renku.keycloak.realm .) }}
+          issuer: {{ printf "%s/realms/%s" (include "renku.keycloakUrl" .) (include "renku.keycloak.realm" .) }}
           clientID: renku-cli
           scopes: []
           callbackURI: {{ printf "%s/api/auth/callback" (include "renku.baseUrl" .) }}
           usePKCE: false
         gitlab:
           default: true 
-          issuer: {{ pritnf "%s/oauth" (include "renku.gitlabUrl" .) }}
+          issuer: {{ printf "%s/oauth" (include "renku.gitlabUrl" .) }}
           clientID: {{ .Values.gateway.gitlabClientId | default .Values.global.gateway.gitlabClientId | quote }}
           scopes: ["openid", "api", "read_user", "read_repository"] 
           callbackURI: {{ printf "%s/api/auth/callback" (include "renku.baseUrl" .) }}
diff --git a/helm-chart/renku/templates/gateway/deployment-revproxy.yaml b/helm-chart/renku/templates/gateway/deployment-revproxy.yaml
index a20b6cc0fc..b29b834b9c 100644
--- a/helm-chart/renku/templates/gateway/deployment-revproxy.yaml
+++ b/helm-chart/renku/templates/gateway/deployment-revproxy.yaml
@@ -34,7 +34,7 @@ spec:
         {{- include "certificates.initContainer" . | nindent 8 }}
       containers:
         - name: gateway 
-          image: "{{ .Values.gateway.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.gateway.image.repository }}:{{ .Values.gateway.image.tag }}"
           imagePullPolicy: {{ .Values.gateway.image.pullPolicy }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
@@ -49,7 +49,7 @@ spec:
                   name: {{ .Values.global.redis.existingSecret }}
                   key: {{ .Values.global.redis.existingSecretPasswordKey }}
           volumeMounts:
-            {{- include "certificates.volumeMo- name: config-volume
+            {{- include "certificates.volumeMounts.system" . | nindent 12 }}
             - mountPath: "/etc/gateway"
               name: public-config
             - mountPath: "/etc/gateway"
diff --git a/helm-chart/renku/templates/ingress.yaml b/helm-chart/renku/templates/ingress.yaml
index 331fe98217..fe6de8845f 100644
--- a/helm-chart/renku/templates/ingress.yaml
+++ b/helm-chart/renku/templates/ingress.yaml
@@ -71,7 +71,7 @@ spec:
             port:
               number: {{ $gitlabServicePort }}
             {{ else }}
-            name: renku-traefik
+            name: {{ template "renku.fullname" . }}-gateway
             port:
               number: 80
             {{- end }}
@@ -79,21 +79,21 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: renku-traefik
+            name: {{ template "renku.fullname" . }}-gateway
             port:
               number: 80
       - path: /api
         pathType: Prefix
         backend:
           service:
-            name: renku-traefik
+            name: {{ template "renku.fullname" . }}-gateway
             port:
               number: 80
       - path: /entities
         pathType: Prefix
         backend:
           service:
-            name: renku-traefik
+            name: {{ template "renku.fullname" . }}-gateway
             port:
               number: 80
       - path: /
diff --git a/helm-chart/renku/templates/notebooks/statefulset.yaml b/helm-chart/renku/templates/notebooks/statefulset.yaml
index b537f101aa..5b1f2d33b4 100644
--- a/helm-chart/renku/templates/notebooks/statefulset.yaml
+++ b/helm-chart/renku/templates/notebooks/statefulset.yaml
@@ -72,7 +72,7 @@ spec:
             {{ if .Values.notebooks.gitlab.url }}
               value: {{ .Values.notebooks.gitlab.url }}
             {{ else }}
-              value: {{ template "notebooks.http" . }}://{{ .Values.global.renku.domain}}{{ .Values.global.gitlab.urlPrefix }}
+              value: {{ template "renku.http" . }}://{{ .Values.global.renku.domain}}{{ .Values.global.gitlab.urlPrefix }}
             {{ end }}
             - name: NB_GIT__REGISTRY
               value: {{ required "An image registry must be specified." .Values.notebooks.gitlab.registry.host }}