Skip to content

Commit

Permalink
fix: add support for extraEnv specification on network node root cont…
Browse files Browse the repository at this point in the history
…ainers (#886)

Signed-off-by: Nathan Klick <nathan@swirldslabs.com>
  • Loading branch information
nathanklick authored Jun 12, 2024
1 parent 2ab4080 commit 96ea24a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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 -}}
{{- $rootExtraEnv := ($root).extraEnv | default $.Values.defaults.root.extraEnv -}}
{{- $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 -}}
Expand Down Expand Up @@ -229,6 +230,9 @@ spec:
mountPath: /opt/hgcapp/services-hedera/HapiApp2.0/output
env:
{{- include "fullstack.defaultEnvVars" . | nindent 10 }}
{{- with $rootExtraEnv }}
{{- toYaml . | nindent 10 }}
{{- end }}
{{- if $balanceUploader.enabled }}
# Sidecar: {{ $node.name }}-account-balance-uploader
- name: {{ default "account-balance-uploader" $balanceUploader.nameOverride }}
Expand Down
3 changes: 2 additions & 1 deletion charts/fullstack-deployment/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,11 @@ defaults:
root: # root container
image:
registry: "ghcr.io"
repository: "hashgraph/full-stack-testing/ubi8-init-java17"
repository: "hashgraph/full-stack-testing/ubi8-init-java21"
tag: "" # this should be empty since we want the default behavior of $.Chart.appVersion to apply
pullPolicy: "IfNotPresent"
resources: {}
extraEnv: []
service:
serviceType: "LoadBalancer"
haproxy:
Expand Down

0 comments on commit 96ea24a

Please sign in to comment.