fix: allow overriding token generator image and parse k8s version to …

…avoid including metadata (#5)
stafftastic · Feb 10, 2024 · ba195b5 · ba195b5
1 parent ab0a50c
commit ba195b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/templates/token-generator/job.yaml b/templates/token-generator/job.yaml
@@ -16,7 +16,12 @@ spec:
       serviceAccountName: {{ include "jitsu.tokenGenerator.serviceAccountName" . }}
       containers:
         - name: token-generator
-          image: "alpine/k8s:{{ .Capabilities.KubeVersion.Version | trimPrefix "v"}}"
+          {{- if .Values.tokenGenerator.image.tag }}
+          image: "{{ .Values.tokenGenerator.image.repository }}:{{ .Values.tokenGenerator.image.tag }}"
+          {{- else }}
+          {{- $v := semver .Capabilities.KubeVersion.Version }}
+          image: "{{ .Values.tokenGenerator.image.repository }}:{{ printf "%d.%d.%d" $v.Major $v.Minor $v.Patch }}"
+          {{- end }}
           env:
             - name: FULLNAME
               value: {{ include "jitsu.fullname" . }}

diff --git a/values.yaml b/values.yaml
@@ -54,6 +54,9 @@ ingress:
 tokenGenerator:
   # Generate inter-service auth tokens automatically upon deployment.
   enabled: true
+  image:
+    repository: alpine/k8s
+    tag: ""
   serviceAccount:
     create: true
     annotations: {}