Skip to content

Commit 40269d2

Browse files
feat: update Helm charts to handle Hedera Docker container deterministic image (#968)
Signed-off-by: Jeromy Cannon <[email protected]>
1 parent a952578 commit 40269d2

File tree

4 files changed

+32
-6
lines changed

4 files changed

+32
-6
lines changed

.github/workflows/support/ci_test.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,12 @@ echo "Get service and pod information"
7575
kubectl get svc -o wide && \
7676
kubectl get pods -o wide && \
7777

78-
echo "Waiting for network-node pods to be active (first deployment takes ~10m)...."
78+
echo "Waiting for network-node pods to be phase=running (first deployment takes ~10m)...."
7979
kubectl wait --for=jsonpath='{.status.phase}'=Running pod -l fullstack.hedera.com/type=network-node --timeout=900s
8080

81+
echo "Waiting for network-node pods to be condition=ready (first deployment takes ~10m)...."
82+
kubectl wait --for=condition=ready pod -l fullstack.hedera.com/type=network-node --timeout=900s
83+
8184
echo "Service Information...."
8285
kubectl get svc -o wide
8386

charts/fullstack-deployment/Chart.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dependencies:
44
version: 0.2.0
55
- name: hedera-mirror
66
repository: https://hashgraph.github.io/hedera-mirror-node/charts
7-
version: 0.110.1
7+
version: 0.111.1
88
- name: tenant
99
repository: https://operator.min.io/
1010
version: 5.0.12
@@ -14,5 +14,5 @@ dependencies:
1414
- name: haproxy-ingress
1515
repository: https://haproxy-ingress.github.io/charts
1616
version: 0.14.5
17-
digest: sha256:0e6897144860871142fd0db8c0a34fc113dc66121aa50c1482e89d932d323af8
18-
generated: "2024-08-09T12:47:26.726721+01:00"
17+
digest: sha256:ca8cade42bbfa3211fde7112cb0998e8c7c86587c9113b10f2cbd209683113b0
18+
generated: "2024-09-06T10:44:29.620625+01:00"

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

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ spec:
156156
task() {
157157
mkdir -p /opt/hgcapp/recordStreams/record{{ $node.accountId }}/sidecar
158158
chmod 777 /opt/hgcapp/recordStreams/record{{ $node.accountId }}/sidecar
159-
curl network-{{ $node.name }}-0.network-{{ $node.name }}.{{ default $.Release.Namespace $.Values.global.namespaceOverride }}.svc.cluster.local:13133
160159
}
161160
task
162161
failureThreshold: 30
@@ -537,8 +536,29 @@ spec:
537536
{{- toYaml . | nindent 10 }}
538537
{{- end }}
539538
{{- end }}
540-
{{- if gt $initContainersLength 0 }}
541539
initContainers:
540+
- name: init-hedera
541+
image: curlimages/curl:8.9.1
542+
command:
543+
- "sh"
544+
- "-c"
545+
- |
546+
loop=1
547+
while [ "$loop" -ne 0 ]; do
548+
loop=0;
549+
{{- range $index, $node := $.Values.hedera.nodes }}
550+
nslookup network-{{ $node.name }}-0.network-{{ $node.name }}.{{ default $.Release.Namespace $.Values.global.namespaceOverride }}.svc.cluster.local;
551+
rc=$?;
552+
if [ "$loop" -eq 0 -a "$rc" -eq 0 ]; then
553+
loop=0;
554+
else
555+
loop=1;
556+
fi
557+
{{- end }}
558+
sleep 5;
559+
done
560+
return 0
561+
{{- if gt $initContainersLength 0 }}
542562
{{- toYaml $.Values.hedera.initContainers | nindent 8 }}
543563
{{- end }}
544564
{{ end }}

charts/fullstack-deployment/tests/test_basic_deployment.bats

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ setup() {
1010
log_debug "Expected total nodes: ${TOTAL_NODES}"
1111
log_debug "----------------------------------------------------------------------------"
1212

13+
log_debug "Waiting for network node pods to be phase=running..."
1314
kubectl wait --for=jsonpath='{.status.phase}'=Running pod -l fullstack.hedera.com/type=network-node --timeout=300s -n "${NAMESPACE}" || return "${EX_ERR}"
15+
log_debug "Waiting for network node pods to be condition=ready..."
16+
kubectl wait --for=condition=ready pod -l fullstack.hedera.com/type=network-node --timeout=300s -n "${NAMESPACE}" || return "${EX_ERR}"
1417

1518
local resp="$(get_pod_list network-node)"
1619
local nodes=(${resp}) # convert into an array

0 commit comments

Comments
 (0)