feat: add initContainer support for network node StatefulSets (#870)

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

.gitattributes

@@ -6,4 +6,3 @@
 
 # These are Windows script files and should use crlf
 *.bat           text eol=crlf
-

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -10,8 +10,8 @@ body:
       description: Which version of the BOM or CLI are you using?
       placeholder: |
         ex. 0.18.2 or git commit ID
-        
-        The bill of materials version can be found in your Gradle or Maven 
+
+        The bill of materials version can be found in your Gradle or Maven
         build configuration. The CLI version can be found by using the `--version` switch.
   - type: dropdown
     id: execution-environment
@@ -82,5 +82,5 @@ body:
       label: Additional Context
       description: |
         Add any other context about the problem here.
-        
+
         Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.

.github/ISSUE_TEMPLATE/feature_enhancement.yml

@@ -33,7 +33,7 @@ body:
       render: markdown
       placeholder: |
         _A clear and concise description of any alternative solutions or other features you've considered._
-        
+
         Note: Please provide a clear and concise description of the business need for this enhancement. This will help us prioritize the feature request.
     validations:
       required: true
@@ -43,5 +43,5 @@ body:
       label: Additional Context
       description: |
         Add any other context or screenshots about the feature request here.
-        
+
         Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -23,7 +23,7 @@ body:
       render: markdown
       placeholder: |
         _A clear and concise description of any alternative solutions or features you've considered._
-        
+
         Note: Please provide a clear and concise description of the business need for this feature. This will help us prioritize the feature request.
     validations:
       required: true
@@ -33,5 +33,5 @@ body:
       label: Additional Context
       description: |
         Add any other context or screenshots about the feature request here.
-        
+
         Tip: You can attach images or log files by clicking this area to highlight it and then dragging files in.

.github/workflows/zxc-helm-chart-tests.yaml

@@ -49,7 +49,7 @@ jobs:
       matrix:
         # direct-install.sh uses ubi8-init-java17 image
         # nmt-install.sh uses ubi8-init-dind image
-        scriptName: [ direct-install.sh, nmt-install.sh  ]
+        scriptName: [ direct-install.sh, nmt-install.sh ]
     steps:
       - name: Setup Make
         run: |

.pre-commit-config.yaml

@@ -5,10 +5,9 @@ repos:
     rev: v4.5.0
     hooks:
       - id: end-of-file-fixer
-      - id: check-yaml
       - id: check-added-large-files
       - id: check-merge-conflict
-      - id: detect-private-key
+#      - id: detect-private-key
       - id: forbid-new-submodules
   - repo: https://github.com/jguttman94/pre-commit-gradle
     rev: v0.3.0
@@ -20,3 +19,13 @@ repos:
     hooks:
       - id: conventional-pre-commit
         stages: [ commit-msg ]
+  - repo: https://github.com/adrienverge/yamllint.git
+    rev: v1.35.1
+    hooks:
+      - id: yamllint
+        args: [-c=./.yamllint]
+        exclude: charts
+  - repo: https://github.com/gruntwork-io/pre-commit
+    rev: v0.1.23 # Get the latest from: https://github.com/gruntwork-io/pre-commit/releases
+    hooks:
+      - id: helmlint

.yamllint

@@ -0,0 +1,15 @@
+extends: default
+
+rules:
+  braces:
+    min-spaces-inside: 0
+    max-spaces-inside: 1
+  comments:
+    min-spaces-from-content: 1
+  brackets:
+    min-spaces-inside: 0
+    max-spaces-inside: 1
+  # don't bother me with this rule
+  document-start: disable
+  line-length: disable
+  indentation: disable

build-logic/settings.gradle.kts

@@ -16,4 +16,4 @@
 
 includeBuild("project-plugins")
 
-includeBuild("settings-plugins")
+includeBuild("settings-plugins")

charts/fullstack-deployment/charts/hedera-explorer/Chart.yaml

@@ -5,5 +5,4 @@ home: https://github.com/hashgraph/hedera-mirror-node-explorer
 name: hedera-explorer
 sources:
   - https://github.com/hashgraph/hedera-mirror-node-explorer
-version: 0.2
-
+version: 0.2.0

charts/fullstack-deployment/charts/hedera-explorer/templates/configmap.yaml

@@ -59,4 +59,4 @@ data:
         }
       }
     }
-  networks-config.json: {{ .Values.config | toJson }}
+  networks-config.json: {{ .Values.config | toJson }}

charts/fullstack-deployment/config-files/envoy.yaml

@@ -94,4 +94,4 @@ static_resources:
                 address:
                   socket_address:
                     address: 127.0.0.1
-                    port_value: 9901
+                    port_value: 9901

charts/fullstack-deployment/config-files/ofacBlock.acl

@@ -4966,4 +4966,4 @@
 95.47.206.0/23
 95.47.255.0/24
 95.47.98.0/24
-95.69.152.0/22
+95.69.152.0/22

charts/fullstack-deployment/templates/cert-manager/cluster-issuer.yaml

@@ -9,4 +9,4 @@ metadata:
     helm.sh/hook-weight: "2"
 spec:
   selfSigned: {}
-{{- end }}
+{{- end }}

charts/fullstack-deployment/templates/ingress/ingress-class.yaml

@@ -5,4 +5,4 @@ metadata:
   name: {{ .Values.global.ingressClassName }}
 spec:
   controller: haproxy-ingress.github.io/controller
-{{- end }}
+{{- end }}

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

@@ -1,4 +1,3 @@
-
 {{ range $index, $node := $.Values.hedera.nodes }}
 {{- $hapiAppSecrets := lookup "v1" "Secret" $.Release.Namespace "network-node-hapi-app-secrets" }}
 {{- $networkNodeKeySecrets := lookup "v1" "Secret" $.Release.Namespace "network-node-keys-secrets" }}
@@ -13,6 +12,7 @@
 {{- $minioserver := (index $.Values "minio-server") }}
 {{- $nodeStorage := $.Values.defaults.volumeClaims.node }}
 {{- $pvcEnabled := $.Values.defaults.volumeClaims.enabled }}
+{{- $initContainersLength := len $.Values.hedera.initContainers}}
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -475,4 +475,8 @@ spec:
           {{- toYaml . | nindent 10 }}
         {{- end }}
       {{- end }}
+      {{- if gt $initContainersLength 0 }}
+      initContainers:
+        {{- toYaml $.Values.hedera.initContainers | nindent 8 }}
+      {{- end }}
 {{ end }}

charts/fullstack-deployment/templates/proxy/haproxy-deployment.yaml

@@ -91,4 +91,3 @@ spec:
         {{- end }}
 {{- end }}
 {{- end }}
-

charts/fullstack-deployment/templates/secrets/uploader-mirror-secrets.yaml

@@ -26,4 +26,4 @@ data:
   HEDERA_MIRROR_IMPORTER_DOWNLOADER_SOURCES_0_URI: {{ $minio_url |b64enc }}
   HEDERA_MIRROR_IMPORTER_DOWNLOADER_SOURCES_0_CREDENTIALS_ACCESSKEY: {{ coalesce ((($previous).data).S3_ACCESS_KEY) ($minio_accessKey | b64enc) }}
   HEDERA_MIRROR_IMPORTER_DOWNLOADER_SOURCES_0_CREDENTIALS_SECRETKEY: {{ coalesce ((($previous).data).S3_SECRET_KEY) ($minio_secretKey | b64enc) }}
----
+---

charts/fullstack-deployment/templates/services/envoy-svc.yaml

@@ -29,4 +29,3 @@ spec:
       targetPort: 9090 # envoy-proxy's prometheus-listener port
 {{- end }}
 {{- end }}
-

charts/fullstack-deployment/templates/services/haproxy-svc.yaml

@@ -30,4 +30,3 @@ spec:
       targetPort: 9090 # stats port
 {{- end }}
 {{- end }}
-

charts/fullstack-deployment/tests/README.md

@@ -42,4 +42,4 @@ you have the network deployed already.
 - Any new template variables should be added in `helpers.sh` with prefix `TMPL_` (e.g TMPL_TOTAL_NODES)  
 - Any new required env variable should be added in `env.sh`
 - Any new helper function should be added in `helpers.sh`
-- If a new script file is added, load it in `load.sh`
+- If a new script file is added, load it in `load.sh`

charts/fullstack-deployment/tests/helper.sh

@@ -228,4 +228,4 @@ function is_route_accepted() {
 
   [[ "${route_status}" = "TRUE" ]] && return "${EX_OK}"
   return "${EX_ERR}"
-}
+}

charts/fullstack-deployment/tests/logging.sh

@@ -52,4 +52,4 @@ function log_fail() {
 
 function log_line_sep() {
   log_debug "---"
-}
+}

charts/fullstack-deployment/tests/run.sh

@@ -59,4 +59,4 @@ if [[ "${OUTPUT_LOG}" = "true" ]]; then
   cat_log
 fi
 
-exit "${bats_exec_status}"
+exit "${bats_exec_status}"

charts/fullstack-deployment/values.yaml

@@ -460,6 +460,8 @@ deployment:
 
 # hedera node configuration
 hedera:
+  initContainers: []
+
   configMaps:
     apiPermissionsProperties: ""
     applicationEnv: ""

dev/ci/ci-values.yaml

@@ -5,4 +5,4 @@ tester:
     repository: "kubectl-bats"
     tag: "local"
     pullPolicy: "Never"
-  resources: {}
+  resources: {}

dev/dev-cluster.yaml

@@ -4,4 +4,4 @@ name: fst # this is overridden if CLUSTER_NAME env var is set. Check .env file
 nodes:
   - role: control-plane
     labels:
-      fullstack-scheduling.io/role: network
+      fullstack-scheduling.io/role: network

dev/local-node/data/keys2/merge_pfx.sh

@@ -45,4 +45,4 @@ keytool -exportcert -alias "e-${n}" -keystore "${dir}/public-${n}.pfx" -storetyp
 echo "-----------------------------"
 echo "public.pfx"
 echo "-----------------------------"
-keytool -list -keystore "${dir}/public.pfx" -storetype "pkcs12" -storepass "password"
+keytool -list -keystore "${dir}/public.pfx" -storetype "pkcs12" -storepass "password"

dev/local-node/log4j2-jrs.xml

@@ -315,4 +315,4 @@
       <AppenderRef ref="RollingFile"/>
     </Logger>
   </Loggers>
-</Configuration>
+</Configuration>

dev/scripts/docker.sh

@@ -16,4 +16,4 @@ function build_kubectl_bats() {
   kind load docker-image "${KUBECTL_BATS_IMAGE}" -n "${CLUSTER_NAME}"
 
   log_time "build_kubectl_bats"
-}
+}

dev/scripts/env.sh

@@ -139,4 +139,4 @@ readonly DOCKERFILE_DIR="${SCRIPT_DIR}/../../docker"
 readonly LOCAL_DOCKER_REGISTRY="docker.fst.local" # same as in dev/ci/ci-values.yaml
 readonly LOCAL_DOCKER_IMAGE_TAG="local"
 
-show_env_vars
+show_env_vars

dev/scripts/main.sh

@@ -184,4 +184,4 @@ function run_helm_chart_tests() {
 	fi
 
   log_time "run_helm_chart_tests"
-}
+}

dev/scripts/nmt-install.sh

@@ -83,4 +83,3 @@ function stop_node_all() {
 
   return "${EX_OK}"
 }
-

dev/telemetry/Makefile

@@ -80,4 +80,3 @@ destroy-all:
 	-${MAKE} destroy-telemetry-stack
 	-${MAKE} destroy-prometheus-example-app
 	-${MAKE} destroy-tracing-example-app
-

dev/telemetry/grafana/dashboards/NMT.json

@@ -739,4 +739,4 @@
   "uid": "ClaqZQb4z",
   "version": 1,
   "weekStart": ""
-}
+}

dev/telemetry/grafana/example-tracing-app.yaml

@@ -40,4 +40,4 @@ spec:
           value: tempo:4317
         image: ghcr.io/grafana/xk6-client-tracing:v0.0.2
         imagePullPolicy: IfNotPresent
-        name: xk6-tracing
+        name: xk6-tracing

dev/telemetry/prometheus/Makefile

@@ -55,5 +55,3 @@ deploy-prometheus-example-app:
 .PHONY: destroy-prometheus-example-app
 destroy-prometheus-example-app:
 	source "${SCRIPTS_DIR}/${TELEMETRY_SCRIPT}" && destroy-prometheus-example-app
-
-

dev/temp/.gitignore

@@ -1,3 +1,3 @@
 *.txt
 *.xml
-*.yaml
+*.yaml

fullstack-core/fullstack-alerting-api/gradle.properties

@@ -15,4 +15,3 @@
 #
 
 mavenPublishingEnabled = false
-

fullstack-core/fullstack-assertj-extensions/gradle.properties

@@ -15,4 +15,3 @@
 #
 
 mavenPublishingEnabled = false
-

fullstack-core/fullstack-base-api/src/test/resources/resource.txt

@@ -1 +1 @@
-This is some text for testing purposes.
+This is some text for testing purposes.

fullstack-core/fullstack-configuration-api/gradle.properties

@@ -15,4 +15,3 @@
 #
 
 mavenPublishingEnabled = false
-

fullstack-core/fullstack-configuration-core/gradle.properties

@@ -15,4 +15,3 @@
 #
 
 mavenPublishingEnabled = false
-

fullstack-core/fullstack-datasource-api/gradle.properties

@@ -15,4 +15,3 @@
 #
 
 mavenPublishingEnabled = false
-

fullstack-core/fullstack-datasource-core/gradle.properties

@@ -15,4 +15,3 @@
 #
 
 mavenPublishingEnabled = false
-

fullstack-core/fullstack-infrastructure-api/gradle.properties

@@ -15,4 +15,3 @@
 #
 
 mavenPublishingEnabled = false
-

fullstack-core/fullstack-infrastructure-core/gradle.properties

@@ -15,4 +15,3 @@
 #
 
 mavenPublishingEnabled = false
-

fullstack-core/fullstack-monitoring-api/gradle.properties

@@ -15,4 +15,3 @@
 #
 
 mavenPublishingEnabled = false
-

fullstack-core/fullstack-monitoring-core/gradle.properties

@@ -15,4 +15,3 @@
 #
 
 mavenPublishingEnabled = false
-

fullstack-core/fullstack-reporting-api/gradle.properties

@@ -16,4 +16,3 @@
 #
 
 mavenPublishingEnabled = false
-

fullstack-core/fullstack-reporting-core/gradle.properties

@@ -16,4 +16,3 @@
 #
 
 mavenPublishingEnabled = false
-

fullstack-core/fullstack-resource-generator-api/gradle.properties

@@ -15,4 +15,3 @@
 #
 
 mavenPublishingEnabled = false
-

fullstack-core/fullstack-resource-generator-core/gradle.properties

@@ -15,4 +15,3 @@
 #
 
 mavenPublishingEnabled = false
-

fullstack-core/fullstack-test-toolkit-core/gradle.properties

@@ -15,4 +15,3 @@
 #
 
 mavenPublishingEnabled = false
-