Allow to split the image registry and the repository

open-telemetry · Oct 30, 2024 · aa8309b · aa8309b
1 parent b8406fc
commit aa8309b
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: opentelemetry-collector
-version: 0.108.0
+version: 0.108.1
 description: OpenTelemetry Collector Helm chart for Kubernetes
 type: application
 home: https://opentelemetry.io/

diff --git a/charts/opentelemetry-collector/templates/_helpers.tpl b/charts/opentelemetry-collector/templates/_helpers.tpl
@@ -242,3 +242,10 @@ Create ConfigMap checksum annotation if configMap.existingPath is defined, other
     {{- end -}}
   {{- end }}
 {{- end }}
+
+{{/*
+Return the the image registry.
+*/}}
+{{- define "opentelemetry-collector.imageRegistry" -}}
+  {{ default .Values.image.registry (.Values.global).imageRegistry }}
+{{- end }}
diff --git a/charts/opentelemetry-collector/templates/_pod.tpl b/charts/opentelemetry-collector/templates/_pod.tpl
@@ -33,10 +33,11 @@ containers:
       {{- else -}}
       {{- toYaml .Values.securityContext | nindent 6 }}
       {{- end }}
+    {{- $imageRegistry := include "opentelemetry-collector.imageRegistry" . -}}
     {{- if .Values.image.digest }}
-    image: "{{ ternary "" (print (.Values.global).imageRegistry "/") (empty (.Values.global).imageRegistry) }}{{ .Values.image.repository }}@{{ .Values.image.digest }}"
+    image: "{{ ternary "" (print $imageRegistry "/") (empty $imageRegistry) }}{{ .Values.image.repository }}@{{ .Values.image.digest }}"
     {{- else }}
-    image: "{{ ternary "" (print (.Values.global).imageRegistry "/") (empty (.Values.global).imageRegistry) }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+    image: "{{ ternary "" (print $imageRegistry "/") (empty $imageRegistry) }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
     {{- end }}
     imagePullPolicy: {{ .Values.image.pullPolicy }}
 

diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml
@@ -187,6 +187,7 @@ config:
 alternateConfig: {}
 
 image:
+  registry: ""
   # If you want to use the core image `otel/opentelemetry-collector`, you also need to change `command.name` value to `otelcol`.
   repository: ""
   pullPolicy: IfNotPresent