squashme: minor fix

SwissDataScienceCenter · Jan 19, 2024 · fd03189 · fd03189
1 parent da0a57a
commit fd03189
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/helm-chart/renku/templates/gateway/config.yaml b/helm-chart/renku/templates/gateway/config.yaml
@@ -8,7 +8,7 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-  config.yaml:
+  config.yaml: |
     server:
       port: 8080
       host: 0.0.0.0
@@ -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
@@ -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/gateway/secret.yaml b/helm-chart/renku/templates/gateway/secret.yaml
@@ -118,7 +118,7 @@ data:
   {{- end }}
 
   #### New stuff for the gateway refactoring
-  secret_config.yaml:
+  secret_config.yaml: |
     login:
       tokenEncryption:
         secretKey: {{ $tokenEncryptionSecretKey }}

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: /

diff --git 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 }}