squashme: minor fix

SwissDataScienceCenter · Jan 18, 2024 · 7ff94c1 · 7ff94c1
1 parent da0a57a
commit 7ff94c1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git 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
@@ -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
@@ -71,29 +71,29 @@ spec:
             port:
               number: {{ $gitlabServicePort }}
             {{ else }}
-            name: renku-traefik
+            name: {{ template "renku.fullname" . }}-gateway
             port:
               number: 80
             {{- end }}
       - path: /repos
         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: /