make curl image respect global.imageRegistry (#621)

jaegertracing · Dec 1, 2024 · e2dc664 · e2dc664
1 parent 05e6fa3
commit e2dc664
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 1.53.0
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
 type: application
-version: 3.3.2
+version: 3.3.3
 # CronJobs require v1.21
 kubeVersion: ">= 1.21-0"
 keywords:

diff --git a/charts/jaeger/templates/_helpers.tpl b/charts/jaeger/templates/_helpers.tpl
@@ -717,6 +717,18 @@ Create image name for hotrod image
 {{- include "renderImage" ( dict "imageRoot" .Values.hotrod.image "context" $ ) -}}
 {{- end -}}
 
+{{/*
+Define curl image declaration
+*/}}
+{{- define "curl.image" -}}
+{{- $image := "curlimages/curl" -}}
+{{- if .Values.global.imageRegistry -}}
+{{ .Values.global.imageRegistry }}/{{ $image }}
+{{- else -}}
+{{ $image }}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Create pull secrets for hotrod image
 */}}

diff --git a/charts/jaeger/templates/collector-deploy.yaml b/charts/jaeger/templates/collector-deploy.yaml
@@ -35,7 +35,7 @@ spec:
        {{- if .Values.provisionDataStore.elasticsearch }}
       initContainers:
         - name: elasticsearch-checker
-          image: curlimages/curl
+          image: {{ include "curl.image" . }}
           command: 
           - sh
           - "-c"

diff --git a/charts/jaeger/templates/query-deploy.yaml b/charts/jaeger/templates/query-deploy.yaml
@@ -51,7 +51,7 @@ spec:
         {{- end }}
         {{- if .Values.provisionDataStore.elasticsearch }}
         - name: elasticsearch-checker
-          image: curlimages/curl
+          image: {{ include "curl.image" . }}
           command: 
           - sh
           - "-c"