From 47c2ac442af163181e8eb4a9b327fae4124f2d18 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Wed, 5 Jun 2024 14:20:16 +0300 Subject: [PATCH] Add defaultPulsarImageRepository configuration (#503) - makes it easier to use a custom image --- charts/pulsar/templates/_helpers.tpl | 2 +- charts/pulsar/values.yaml | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/charts/pulsar/templates/_helpers.tpl b/charts/pulsar/templates/_helpers.tpl index 9c24c77..c41e213 100644 --- a/charts/pulsar/templates/_helpers.tpl +++ b/charts/pulsar/templates/_helpers.tpl @@ -126,5 +126,5 @@ imagePullSecrets: Create full image name */}} {{- define "pulsar.imageFullName" -}} -{{- printf "%s:%s" .image.repository (.image.tag | default .root.Values.defaultPulsarImageTag | default .root.Chart.AppVersion) -}} +{{- printf "%s:%s" (.image.repository | default .root.Values.defaultPulsarImageRepository) (.image.tag | default .root.Values.defaultPulsarImageTag | default .root.Chart.AppVersion) -}} {{- end -}} diff --git a/charts/pulsar/values.yaml b/charts/pulsar/values.yaml index 2f0ef2f..21cb554 100755 --- a/charts/pulsar/values.yaml +++ b/charts/pulsar/values.yaml @@ -130,6 +130,9 @@ components: # pulsar manager pulsar_manager: false +# default image repository for pulsar images +defaultPulsarImageRepository: apachepulsar/pulsar-all + # default image tag for pulsar images # uses chart's appVersion when unspecified defaultPulsarImageTag: @@ -142,32 +145,38 @@ images: # imagePullSecrets: # - secretName zookeeper: - repository: apachepulsar/pulsar-all + # uses defaultPulsarImageRepository when unspecified + repository: # uses defaultPulsarImageTag when unspecified tag: pullPolicy: IfNotPresent bookie: - repository: apachepulsar/pulsar-all + # uses defaultPulsarImageRepository when unspecified + repository: # uses defaultPulsarImageTag when unspecified tag: pullPolicy: IfNotPresent autorecovery: - repository: apachepulsar/pulsar-all + # uses defaultPulsarImageRepository when unspecified + repository: # uses defaultPulsarImageTag when unspecified tag: pullPolicy: IfNotPresent broker: - repository: apachepulsar/pulsar-all + # uses defaultPulsarImageRepository when unspecified + repository: # uses defaultPulsarImageTag when unspecified tag: pullPolicy: IfNotPresent proxy: - repository: apachepulsar/pulsar-all + # uses defaultPulsarImageRepository when unspecified + repository: # uses defaultPulsarImageTag when unspecified tag: pullPolicy: IfNotPresent functions: - repository: apachepulsar/pulsar-all + # uses defaultPulsarImageRepository when unspecified + repository: # uses defaultPulsarImageTag when unspecified tag: pulsar_manager: @@ -713,7 +722,8 @@ pulsar_metadata: component: pulsar-init image: # the image used for running `pulsar-cluster-initialize` job - repository: apachepulsar/pulsar-all + # uses defaultPulsarImageRepository when unspecified + repository: # uses defaultPulsarImageTag when unspecified tag: pullPolicy: IfNotPresent