fix(helm): derive bootstrap names from node helpers

Author: roderik

charts/network/README.md

@@ -21,10 +21,10 @@ A Helm chart for a blockchain network on Kubernetes
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| global | object | `{"networkNodes":{"faucetArtifactPrefix":"besu-faucet","genesisConfigMapName":"besu-genesis","podPrefix":"besu-node-validator","serviceName":"besu-node","staticNodesConfigMapName":"besu-static-nodes"}}` | Global configuration shared across subcharts. |
-| global.networkNodes | object | `{"faucetArtifactPrefix":"besu-faucet","genesisConfigMapName":"besu-genesis","podPrefix":"besu-node-validator","serviceName":"besu-node","staticNodesConfigMapName":"besu-static-nodes"}` | Defaults consumed by Besu network node workloads. |
+| global | object | `{"networkNodes":{"faucetArtifactPrefix":"besu-faucet","genesisConfigMapName":"besu-genesis","podPrefix":"","serviceName":"","staticNodesConfigMapName":"besu-static-nodes"}}` | Global configuration shared across subcharts. |
+| global.networkNodes | object | `{"faucetArtifactPrefix":"besu-faucet","genesisConfigMapName":"besu-genesis","podPrefix":"","serviceName":"","staticNodesConfigMapName":"besu-static-nodes"}` | Defaults consumed by Besu network node workloads. |
 | global.networkNodes.faucetArtifactPrefix | string | `"besu-faucet"` | Prefix used for faucet ConfigMaps and Secrets. |
 | global.networkNodes.genesisConfigMapName | string | `"besu-genesis"` | ConfigMap name storing the generated genesis.json artifact. |
-| global.networkNodes.podPrefix | string | `"besu-node-validator"` | StatefulSet prefix used for validator pod hostnames. |
-| global.networkNodes.serviceName | string | `"besu-node"` | Kubernetes Service name fronting validator pods to align bootstrapper static-nodes output. |
+| global.networkNodes.podPrefix | string | `""` | StatefulSet prefix used for validator pod hostnames. |
+| global.networkNodes.serviceName | string | `""` | Kubernetes Service name fronting validator pods to align bootstrapper static-nodes output. |
 | global.networkNodes.staticNodesConfigMapName | string | `"besu-static-nodes"` | ConfigMap name storing static-nodes.json entries. |

charts/network/charts/network-bootstrapper/templates/job.yaml

@@ -46,8 +46,16 @@ spec:
             {{- $resolvedStaticPort := default $defaultStaticPort .Values.settings.staticNodePort }}
             {{- $resolvedStaticDiscovery := default $defaultStaticDiscovery .Values.settings.staticNodeDiscoveryPort }}
             {{- $globalNodes := default (dict) .Values.global.networkNodes }}
-            {{- $resolvedServiceName := default "besu-node" (default (get $globalNodes "serviceName") .Values.settings.staticNodeServiceName) }}
-            {{- $resolvedPodPrefix := default (printf "%s-validator" $resolvedServiceName) (default (get $globalNodes "podPrefix") .Values.settings.staticNodePodPrefix) }}
+            {{- $autoNames := dict "service" "besu-node" "podPrefix" "besu-node-validator" }}
+            {{- with (index $.Subcharts "network-nodes") }}
+              {{- $service := include "nodes.fullname" . }}
+              {{- $_ := set $autoNames "service" $service }}
+              {{- $_ := set $autoNames "podPrefix" (printf "%s-validator" $service) }}
+            {{- end }}
+            {{- $serviceOverride := coalesce .Values.settings.staticNodeServiceName (get $globalNodes "serviceName") }}
+            {{- $resolvedServiceName := default (index $autoNames "service") $serviceOverride }}
+            {{- $podOverride := coalesce .Values.settings.staticNodePodPrefix (get $globalNodes "podPrefix") }}
+            {{- $resolvedPodPrefix := default (index $autoNames "podPrefix") $podOverride }}
             {{- $resolvedGenesisName := default "besu-genesis" (default (get $globalNodes "genesisConfigMapName") .Values.settings.genesisConfigMapName) }}
             {{- $resolvedStaticNodesName := default "besu-static-nodes" (default (get $globalNodes "staticNodesConfigMapName") .Values.settings.staticNodesConfigMapName) }}
             {{- $resolvedFaucetPrefix := default "besu-faucet" (default (get $globalNodes "faucetArtifactPrefix") .Values.settings.faucetArtifactPrefix) }}

charts/network/values.yaml

@@ -5,9 +5,9 @@ global:
   # -- (object) Defaults consumed by Besu network node workloads.
   networkNodes:
     # -- (string) Kubernetes Service name fronting validator pods to align bootstrapper static-nodes output.
-    serviceName: besu-node
+    serviceName: ""
     # -- (string) StatefulSet prefix used for validator pod hostnames.
-    podPrefix: besu-node-validator
+    podPrefix: ""
     # -- (string) ConfigMap name storing the generated genesis.json artifact.
     genesisConfigMapName: besu-genesis
     # -- (string) ConfigMap name storing static-nodes.json entries.