From 4b1c89ca561c0ecb98cdfbfd17cd1c74e7029ffc Mon Sep 17 00:00:00 2001 From: Stavros kois Date: Mon, 20 Feb 2023 23:01:18 +0200 Subject: [PATCH] fix typo in portal and codeserver worload --- .../common/templates/addons/code-server/_workload.tpl | 9 +++++++++ library/common/templates/spawner/_portal.tpl | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/library/common/templates/addons/code-server/_workload.tpl b/library/common/templates/addons/code-server/_workload.tpl index f9a72a26..a1d50706 100644 --- a/library/common/templates/addons/code-server/_workload.tpl +++ b/library/common/templates/addons/code-server/_workload.tpl @@ -3,10 +3,19 @@ The code-server sidecar container to be inserted. */}} {{- define "tc.v1.common.addon.codeserver.workload" -}} enabled: true +type: Deployment podSpec: containers: codeserver: enabled: true + primary: true + probes: + liveness: + enabled: false + readiness: + enabled: false + startup: + enabled: false imageSelector: "codeserverImage" imagePullPolicy: {{ .Values.codeserverImage.pullPolicy }} securityContext: diff --git a/library/common/templates/spawner/_portal.tpl b/library/common/templates/spawner/_portal.tpl index 044f4956..b4587249 100644 --- a/library/common/templates/spawner/_portal.tpl +++ b/library/common/templates/spawner/_portal.tpl @@ -20,7 +20,7 @@ {{- $url := "" -}} {{/* Get service, default to primary */}} - {{- $selectedService := fromYaml ( include "tc.v1.common.lib.helpers.getSelectedServiceValues" (dict "rootCtx" $ "objectData" $objectData.targetSeleector.service ) ) }} + {{- $selectedService := fromYaml ( include "tc.v1.common.lib.helpers.getSelectedServiceValues" (dict "rootCtx" $ "objectData" $objectData.targetSeleector.service ) ) -}} {{/* read loadbalancer IP's for metallb */}} {{- if eq $selectedService.type "LoadBalancer" -}} @@ -54,7 +54,7 @@ {{- if $objectData.targetSelector.ingress -}} {{- $targetIngress := $objectData.targetSelector.ingress -}} {{- else -}} - {{- $targetIngress := include "tc.v1.common.lib.util.service.ingress.primary" $-}} + {{- $targetIngress := include "tc.v1.common.lib.util.service.ingress.primary" $ -}} {{- end -}} {{- $selectedIngress = get .Values.ingress $targetIngress -}} @@ -95,9 +95,9 @@ {{/* Construct URL*/}} {{- if $port -}} - {{- $url = printf "%s://%s:%s/%s" $protocol $host $port %suffix -}} + {{- $url = printf "%s://%s:%s/%s" $protocol $host $port $suffix -}} {{- else -}} - {{- $url = printf "%s://%s/%s" $protocol $host %suffix -}} + {{- $url = printf "%s://%s/%s" $protocol $host $suffix -}} {{- end -}} {{- end -}}