From 675660a9b4310104de86b1c1a85f021f2a46ce4e Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Thu, 11 Apr 2024 17:18:55 +1000 Subject: [PATCH] fix: correctly call sshTokenEndpoint from values --- charts/lagoon-core/ci/linter-values.yaml | 2 ++ charts/lagoon-core/templates/api.deployment.yaml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/charts/lagoon-core/ci/linter-values.yaml b/charts/lagoon-core/ci/linter-values.yaml index 387372c6..f252d1a7 100644 --- a/charts/lagoon-core/ci/linter-values.yaml +++ b/charts/lagoon-core/ci/linter-values.yaml @@ -18,6 +18,8 @@ lagoonUIURL: http://ui:9101 lagoonWebhookURL: http://webhook:11213 defaultIngressClassName: nginx +sshTokenEndpoint: ssh-token.example.com + # used in ui # lagoonAPIURL: https://api.example.com/graphql # keycloakFrontEndURL: https://keycloak.example.com diff --git a/charts/lagoon-core/templates/api.deployment.yaml b/charts/lagoon-core/templates/api.deployment.yaml index 86671678..51146d76 100644 --- a/charts/lagoon-core/templates/api.deployment.yaml +++ b/charts/lagoon-core/templates/api.deployment.yaml @@ -69,10 +69,10 @@ spec: - name: REDIS_HOST value: {{ include "lagoon-core.apiRedis.fullname" . }} - name: SSH_TOKEN_ENDPOINT - value: {{ .Values.sshTokenExchangeEndpoint | quote }} + value: {{ .Values.sshTokenEndpoint | quote }} - name: SSH_TOKEN_ENDPOINT_PORT - {{- if .Values.sshToken.enabled -}} - value: {{ .Values.sshToken.service.ports.sshserver | quote}} + {{- if .Values.sshToken.enabled }} + value: {{ .Values.sshToken.service.ports.sshserver | quote }} {{- else }} value: {{ .Values.ssh.service.port | quote }} {{- end }}