build(chart): unify server route values

SwissDataScienceCenter · Aug 16, 2022 · b9ab7a0 · b9ab7a0
1 parent c780281
commit b9ab7a0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 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.client.uiserverUrl | default (printf "%s://%s/ui-server" (include "ui.protocol" .) .Values.global.renku.domain) | quote }}
+              value: {{ printf "%s/ui-server" .Values.server.route.url | default (printf "%s://%s/ui-server" (include "ui.protocol" .) .Values.global.renku.domain) | 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,21 +40,21 @@ spec:
               protocol: TCP
           env:
             - name: SERVER_URL
-              value: {{ .Values.server.serverData.url | default (printf "https://%s" .Values.global.renku.domain) | quote }}
+              value: {{ .Values.server.route.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.serverData.port | default (printf "8080") | quote }}
+              value: {{ .Values.server.route.port | default (printf "8080") | quote }}
             - name: SERVER_PREFIX
-              value: {{ .Values.server.serverData.prefix | default (printf "/ui-server") | quote }}
+              value: "/ui-server"
             - name: GATEWAY_URL
               value: {{ .Values.gateway.url | default (printf "%s://%s/api" (include "ui.protocol" .) .Values.global.renku.domain) | quote }}
             - name: GATEWAY_LOGIN_PATH
               value: {{ .Values.gateway.loginSuffix | default (printf "/auth/login") | quote }}
             - name: GATEWAY_LOGOUT_PATH
               value: {{ .Values.gateway.logoutSuffix | default (printf "/auth/logout") | quote }}
             - name: AUTH_SERVER_URL
-              value: {{ .Values.server.authentication.url | default (printf "https://%s/auth/realms/Renku" .Values.global.renku.domain) | quote }}
+              value: {{ .Values.server.authentication.url | default (printf "%s://%s/auth/realms/Renku" (include "ui.protocol" .) .Values.global.renku.domain) | quote }}
             - name: AUTH_CLIENT_ID
               value: {{ .Values.server.authentication.id | default (printf "renku-ui") | quote }}
             - name: AUTH_CLIENT_SECRET

diff --git a/helm-chart/renku-ui/values.yaml b/helm-chart/renku-ui/values.yaml
@@ -233,7 +233,7 @@ server:
 
   affinity: {}
 
-  serverData:
+  route:
     url:
     port: 8080
     prefix: /ui-server