build(chart): remove duplicates in client/server charts

SwissDataScienceCenter · Aug 12, 2022 · fe3bfd1 · fe3bfd1
1 parent d57c5c4
commit fe3bfd1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/helm-chart/renku-ui/templates/_helpers.tpl b/helm-chart/renku-ui/templates/_helpers.tpl
@@ -72,3 +72,18 @@ Hack for calling templates in a fake scope (until this is solved https://github.
 {{- $template := index . 2 }}
 {{- include $template (dict "Chart" (dict "Name" $subchart) "Values" (index $dot.Values $subchart) "Release" $dot.Release "Capabilities" $dot.Capabilities) }}
 {{- end }}
+
+{{/*
+Variables for connecting ui to ui-server
+*/}}
+{{- define "ui.uiserverUrlSchemeDomain" -}}
+{{- .Values.server.serverData.url | default (printf "https://%s" .Values.global.renku.domain) -}}
+{{- end -}}
+
+{{- define "ui.uiserverUrlPath" -}}
+{{- .Values.server.serverData.prefix | default (printf "/ui-server") -}}
+{{- end -}}
+
+{{- define "ui.uiserverUrl" -}}
+{{- printf "%s%s"  (include "ui.uiserverUrlSchemeDomain" .) (include "ui.uiserverUrlPath" .) -}}
+{{- end -}}
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.gatewayUrl | 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: {{ (include "ui.uiserverUrl" .) | 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,13 +40,13 @@ spec:
               protocol: TCP
           env:
             - name: SERVER_URL
-              value: {{ .Values.server.serverData.url | default (printf "https://%s" .Values.global.renku.domain) | quote }}
+              value: {{ (include "ui.uiserverUrlSchemeDomain" .) | quote }}
             - name: UI_SERVER_VERSION
               value: {{ .Chart.Version | quote }}
             - name: SERVER_PORT
               value: {{ .Values.server.serverData.port | default (printf "8080") | quote }}
             - name: SERVER_PREFIX
-              value: {{ .Values.server.serverData.prefix | default (printf "/ui-server") | quote }}
+              value: {{ (include "ui.uiserverUrlPath" .) | quote }}
             - name: GATEWAY_URL
               value: {{ .Values.server.gateway.url | default (printf "https://%s/api" .Values.global.renku.domain) | quote }}
             - name: GATEWAY_LOGIN_PATH