From 47807c0a38f05ea2805c5eb8c8df3f136c16e531 Mon Sep 17 00:00:00 2001 From: Lenin Mehedy Date: Wed, 9 Aug 2023 09:27:31 +1000 Subject: [PATCH] fix: use default image tag for proxy containers if it is set Signed-off-by: Lenin Mehedy --- charts/hedera-network/templates/_helpers.tpl | 2 +- charts/hedera-network/templates/proxy/envoy-deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/hedera-network/templates/_helpers.tpl b/charts/hedera-network/templates/_helpers.tpl index e79e961b7..1ffa2273e 100644 --- a/charts/hedera-network/templates/_helpers.tpl +++ b/charts/hedera-network/templates/_helpers.tpl @@ -29,6 +29,6 @@ privileged: true {{- define "fullstack.container.image" -}} {{- $reg := (.image).registry | default .defaults.image.registry -}} {{- $repo := (.image).repository | default .defaults.image.repository -}} -{{- $tag := (.image).tag | default .Chart.AppVersion -}} +{{- $tag := default .defaults.image.tag (.image).tag | default .Chart.AppVersion -}} {{ $reg }}/{{ $repo }}:{{ $tag }} {{- end }} diff --git a/charts/hedera-network/templates/proxy/envoy-deployment.yaml b/charts/hedera-network/templates/proxy/envoy-deployment.yaml index 7de5b3ed0..00ceee94c 100644 --- a/charts/hedera-network/templates/proxy/envoy-deployment.yaml +++ b/charts/hedera-network/templates/proxy/envoy-deployment.yaml @@ -1,6 +1,6 @@ {{ range $index, $node := ($.Values.hedera.nodes) }} {{- $envoyProxy := $node.envoyProxy | default dict -}} -{{- $defaults := $.Values.defaults.haproxy }} +{{- $defaults := $.Values.defaults.envoyProxy }} {{- if default $defaults.enable $envoyProxy.enable | eq "true" }} --- apiVersion: apps/v1