chore: templatize server tag job image (#131)

* chore: templatize server tag job image * trigger build * fix helm issue
hypertrace · Nov 7, 2023 · 0625595 · 0625595
1 parent b3be47b
commit 0625595
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/helm/templates/server/statefulset.yml b/helm/templates/server/statefulset.yml
@@ -54,7 +54,7 @@ spec:
       {{- end }}
       annotations: {{ toYaml $tier.podAnnotations | nindent 8 }}
     spec:
-      {{- with .Values.initContainers }}
+      {{- with $.Values.initContainers }}
       initContainers:
         {{- toYaml . | nindent 8 }}
       {{- end }}
@@ -86,7 +86,7 @@ spec:
               containerPort: {{ $tier.jmx.port }}
               protocol: TCP
             {{- end }}
-            {{- with .Values.extraEnvs }}
+            {{- with $.Values.extraEnvs }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
           volumeMounts:
@@ -101,7 +101,7 @@ spec:
             - name: gcs-iam-secret
               mountPath: "/account"
             {{- end }}
-            {{- with .Values.extraVolumeMounts }}
+            {{- with $.Values.extraVolumeMounts }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
           {{- if $tier.livenessProbe.enabled }}
@@ -173,7 +173,7 @@ spec:
           secret:
             secretName: {{ $.Values.cluster.storage.gs.secretName }}
         {{- end }}
-        {{- with .Values.extraVolumes }}
+        {{- with $.Values.extraVolumes }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
       {{- if $.Values.imagePullSecrets }}

diff --git a/helm/templates/server/tags-job.yaml b/helm/templates/server/tags-job.yaml
@@ -25,7 +25,7 @@ spec:
       serviceAccountName: {{ include "pinot.server.serviceAccountName" . }}
       containers:
         - name: {{ include "pinot.server.fullname" . }}-tags
-          image: curlimages/curl:latest
+          image: {{ .Values.server.tagJob.image.repository }}:{{ .Values.server.tagJob.image.tag }}
           imagePullPolicy: IfNotPresent
           command: ["/bin/sh", "-c"]
           args:

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -516,6 +516,10 @@ server:
 
   tagJobEnabled: false
   tagJobWaitforSideCar: true
+  tagJob:
+    image:
+      repository: curlimages/curl
+      tag: latest
 
 servicemanager:
   name: servicemanager