further simplification

SwissDataScienceCenter · Aug 18, 2022 · 0996662 · 0996662
1 parent c98640e
commit 0996662
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/helm-chart/renku-ui/templates/ui-client-deployment-template.yaml b/helm-chart/renku-ui/templates/ui-client-deployment-template.yaml
@@ -48,7 +48,7 @@ spec:
             - name: GATEWAY_URL
               value: {{ .Values.gateway.url | default (printf "%s://%s/api" (include "ui.protocol" .) .Values.global.renku.domain) | quote }}
             - name: UISERVER_URL
-              value: {{ .Values.server.route.url | default (printf "%s://%s" (include "ui.protocol" .) .Values.global.renku.domain) | printf "%s/ui-server" | quote }}
+              value: {{ .Values.server.url | default (printf "%s://%s" (include "ui.protocol" .) .Values.global.renku.domain) | printf "%s/ui-server" | quote }}
             - name: WELCOME_PAGE
               value: {{ .Values.client.welcomePage.text | b64enc | quote }}
             {{- if .Values.client.statuspage }}

diff --git a/helm-chart/renku-ui/templates/ui-server-deployment.yaml b/helm-chart/renku-ui/templates/ui-server-deployment.yaml
@@ -40,11 +40,11 @@ spec:
               protocol: TCP
           env:
             - name: SERVER_URL
-              value: {{ .Values.server.route.url | default (printf "%s://%s" (include "ui.protocol" .) .Values.global.renku.domain) | quote }}
+              value: {{ .Values.server.url | default (printf "%s://%s" (include "ui.protocol" .) .Values.global.renku.domain) | quote }}
             - name: UI_SERVER_VERSION
               value: {{ .Chart.Version | quote }}
             - name: SERVER_PORT
-              value: {{ .Values.server.route.port | default (printf "8080") | quote }}
+              value: {{ .Values.server.port | default (printf "8080") | quote }}
             - name: SERVER_PREFIX
               value: "/ui-server"
             - name: GATEWAY_URL

diff --git a/helm-chart/renku-ui/values.yaml b/helm-chart/renku-ui/values.yaml
@@ -171,6 +171,9 @@ client:
       tag: "0.11.16"
 
 server:
+  ## The URL for the server service; the URL used by the client is the server.url + /ui-server endpoint.
+  url:
+  port: 8080
   replicaCount: 1
 
   image:
@@ -233,11 +236,6 @@ server:
 
   affinity: {}
 
-  route:
-    url:
-    port: 8080
-    prefix: /ui-server
-
   sentry:
     enabled: false
     dsn: ""