From a179645f2662bd6b807a0872121b3e2a09a9bfef Mon Sep 17 00:00:00 2001 From: ptx96 Date: Tue, 26 Oct 2021 11:05:55 +0200 Subject: [PATCH] feat(helm): find kubectl tag from server version --- charts/capsule/templates/_helpers.tpl | 5 +++++ charts/capsule/values.yaml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/charts/capsule/templates/_helpers.tpl b/charts/capsule/templates/_helpers.tpl index 010315ff..38b52e37 100644 --- a/charts/capsule/templates/_helpers.tpl +++ b/charts/capsule/templates/_helpers.tpl @@ -95,7 +95,12 @@ Create the proxy fully-qualified Docker image to use Create the jobs fully-qualified Docker image to use */}} {{- define "capsule.jobsFullyQualifiedDockerImage" -}} +{{- if .Values.jobs.image.tag }} {{- printf "%s:%s" .Values.jobs.image.repository .Values.jobs.image.tag -}} +{{- else }} +{{- $kubeversion := print "v" .Capabilities.KubeVersion.Major "." .Capabilities.KubeVersion.Minor -}} +{{- printf "%s:%s" .Values.jobs.image.repository $kubeversion -}} +{{- end }} {{- end }} {{/* diff --git a/charts/capsule/values.yaml b/charts/capsule/values.yaml index 1c7750ad..b7c36866 100644 --- a/charts/capsule/values.yaml +++ b/charts/capsule/values.yaml @@ -41,7 +41,7 @@ jobs: image: repository: quay.io/clastix/kubectl pullPolicy: IfNotPresent - tag: "v1.20.7" + tag: "" imagePullSecrets: [] serviceAccount: create: true