fix: correct helm templates to apply root container image correctly (#872)

Signed-off-by: Jeromy Cannon <[email protected]>

Author: jeromy-cannon

charts/fullstack-deployment/templates/_helpers.tpl

@@ -35,14 +35,14 @@ privileged: true
 {{- end }}
 
 {{- define "fullstack.images.pullPolicy" -}}
-{{ (.image).pullPolicy | default .defaults.image.pullPolicy }}
+{{ (.image).pullPolicy | default (((.defaults).root).image).pullPolicy }}
 {{- end }}
 
 
 {{- define "fullstack.container.image" -}}
-{{- $reg := (.image).registry | default .defaults.image.registry -}}
-{{- $repo := (.image).repository | default .defaults.image.repository -}}
-{{- $tag := default .defaults.image.tag (.image).tag | default .Chart.AppVersion -}}
+{{- $reg := (.image).registry | default (((.defaults).root).image).registry -}}
+{{- $repo := (.image).repository | default (((.defaults).root).image).repository -}}
+{{- $tag := default (((.defaults).root).image).tag (.image).tag | default .Chart.AppVersion -}}
 {{ $reg }}/{{ $repo }}:{{ $tag }}
 {{- end }}
 

charts/fullstack-deployment/templates/network-node-statefulset.yaml

@@ -2,6 +2,7 @@
 {{- $hapiAppSecrets := lookup "v1" "Secret" $.Release.Namespace "network-node-hapi-app-secrets" }}
 {{- $networkNodeKeySecrets := lookup "v1" "Secret" $.Release.Namespace "network-node-keys-secrets" }}
 {{- $root := $node.root | default $.Values.defaults.root -}}
+{{- $rootImage := ($node.root).image | default $.Values.defaults.root.image -}}
 {{- $recordStream := ($node.sidecars).recordStreamUploader | default $.Values.defaults.sidecars.recordStreamUploader -}}
 {{- $eventStream := ($node.sidecars).eventStreamUploader | default $.Values.defaults.sidecars.eventStreamUploader -}}
 {{- $balanceUploader := ($node.sidecars).accountBalanceUploader | default $.Values.defaults.sidecars.accountBalanceUploader -}}
@@ -165,8 +166,8 @@ spec:
           failureThreshold: 30
           periodSeconds: 10
           timeoutSeconds: 5
-        image: {{ include "fullstack.container.image" (dict "image" $root.image "Chart" $.Chart "defaults" $root) }}
-        imagePullPolicy: {{ include "fullstack.images.pullPolicy" (dict "image" $root.image "defaults" $root) }}
+        image: {{ include "fullstack.container.image" (dict "image" $rootImage "Chart" $.Chart "defaults" $.Values.defaults) }}
+        imagePullPolicy: {{ include "fullstack.images.pullPolicy" (dict "image" $rootImage "defaults" $.Values.defaults) }}
         securityContext: # need to run as root with privileged mode
           {{- include "fullstack.root.security.context.privileged" . | nindent 10 }}
         {{- with default $defaults.root.resources $node.resources }}