fix(charts): update chainId and security context documentation in values.yaml

- Added chainId field to network-bootstrapper values for explicit configuration.
- Updated comments in values.yaml to ensure clarity and compatibility with helm-docs.
- Adjusted security context documentation to reflect changes in the configuration structure.

Author: roderik

charts/network/README.md

@@ -21,7 +21,8 @@ A Helm chart for a blockchain network on Kubernetes
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| global | object | `{"networkNodes":{"faucetArtifactPrefix":"besu-faucet","genesisConfigMapName":"besu-genesis","podPrefix":"","serviceName":"","staticNodesConfigMapName":"besu-static-nodes"},"securityContexts":{"container":{},"pod":{}}}` | Global configuration shared across subcharts. |
+| global | object | `{"chainId":null,"networkNodes":{"faucetArtifactPrefix":"besu-faucet","genesisConfigMapName":"besu-genesis","podPrefix":"","serviceName":"","staticNodesConfigMapName":"besu-static-nodes"},"securityContexts":{"container":{},"pod":{}}}` | Global configuration shared across subcharts. |
+| global.chainId | int | `nil` | Chain ID applied when charts omit explicit overrides. |
 | 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. |

charts/network/charts/network-bootstrapper/README.md

@@ -23,6 +23,7 @@ A Helm chart for Kubernetes
 | artifacts.external.validators | list | `[]` | Validator node definitions providing the data expected by the nodes chart. Each entry must include `address`, `publicKey`, `privateKey`, and `enode`. |
 | artifacts.source | string | `"generated"` | Determines how Besu network artifacts are populated. Use `generated` to run the job or `external` to supply values manually. |
 | fullnameOverride | string | `"bootstrapper"` | Override for the fully qualified resource name generated by helpers. |
+| global.chainId | int | `nil` | Chain ID applied when `settings.chainId` is unset. |
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy controlling when Kubernetes fetches updated image layers. |
 | image.repository | string | `"ghcr.io/settlemint/network-bootstrapper"` | OCI registry path hosting the network bootstrapper image. |
 | image.tag | string | `""` | Image tag override; leave empty to inherit the chart appVersion. |
@@ -41,7 +42,7 @@ A Helm chart for Kubernetes
 | serviceAccount.create | bool | `true` | Create a ServiceAccount resource for the release automatically. |
 | serviceAccount.name | string | `""` | Existing ServiceAccount name to reuse instead of creating one. |
 | settings.allocations | string | `nil` | Path to a JSON allocations file providing pre-funded accounts. |
-| settings.chainId | int | `nil` | Explicit chain ID to encode into the genesis file. |
+| settings.chainId | int | `nil` | Explicit chain ID to encode into the genesis file. Leave unset to inherit from global.chainId. |
 | settings.clusterDomain | string | `"svc.cluster.local"` | Kubernetes DNS suffix appended to generated static node hostnames when unset by the CLI. |
 | settings.consensus | string | `nil` | Consensus engine to configure (QBFT or IBFTv2). |
 | settings.contractSizeLimit | int | `nil` | Maximum smart-contract bytecode size accepted by the EVM. |

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

@@ -55,7 +55,14 @@ spec:
             {{- $resolvedStaticDomain := default $clusterDomain .Values.settings.staticNodeDomain }}
             {{- $resolvedStaticPort := default $defaultStaticPort .Values.settings.staticNodePort }}
             {{- $resolvedStaticDiscovery := default $defaultStaticDiscovery .Values.settings.staticNodeDiscoveryPort }}
-            {{- $globalNodes := default (dict) .Values.global.networkNodes }}
+            {{- $globalValues := default (dict) .Values.global }}
+            {{- $settingsValues := default (dict) .Values.settings }}
+            {{- $globalNodes := default (dict) (get $globalValues "networkNodes") }}
+            {{- $localChainId := get $settingsValues "chainId" }}
+            {{- $globalChainId := get $globalValues "chainId" }}
+            {{- $localChainIdSet := not (kindIs "invalid" $localChainId) }}
+            {{- $globalChainIdSet := not (kindIs "invalid" $globalChainId) }}
+            {{- $resolvedChainId := ternary $localChainId $globalChainId $localChainIdSet }}
             {{- $autoNames := dict "service" "besu-node" "podPrefix" "besu-node-validator" }}
             {{- with (index $.Subcharts "network-nodes") }}
               {{- $service := include "nodes.fullname" . }}
@@ -92,8 +99,8 @@ spec:
             {{- with .Values.settings.consensus }}
             - --consensus={{ . }}
             {{- end }}
-            {{- with .Values.settings.chainId }}
-            - --chain-id={{ . }}
+            {{- if or $localChainIdSet $globalChainIdSet }}
+            - --chain-id={{ $resolvedChainId }}
             {{- end }}
             {{- with .Values.settings.secondsPerBlock }}
             - --seconds-per-block={{ . }}

charts/network/charts/network-bootstrapper/values.yaml

@@ -1,4 +1,9 @@
 # Default configuration values for the network-bootstrapper subchart. Each key is annotated for helm-docs output.
+
+global:
+  # -- (int) Chain ID applied when `settings.chainId` is unset.
+  chainId:
+
 image:
   # -- (string) OCI registry path hosting the network bootstrapper image.
   repository: ghcr.io/settlemint/network-bootstrapper
@@ -152,7 +157,7 @@ settings:
   outputType: kubernetes
   # -- (string) Consensus engine to configure (QBFT or IBFTv2).
   consensus:
-  # -- (int) Explicit chain ID to encode into the genesis file.
+  # -- (int) Explicit chain ID to encode into the genesis file. Leave unset to inherit from global.chainId.
   chainId:
   # -- (int) Block interval in seconds for the genesis configuration.
   secondsPerBlock:

charts/network/values.yaml

@@ -14,6 +14,8 @@ global:
     staticNodesConfigMapName: besu-static-nodes
     # -- (string) Prefix used for faucet ConfigMaps and Secrets.
     faucetArtifactPrefix: besu-faucet
+  # -- (int) Chain ID applied when charts omit explicit overrides.
+  chainId:
   # -- (object) Shared pod- and container-level security contexts applied when subcharts omit explicit overrides.
   securityContexts:
     # -- (object) Pod security context inherited by subcharts when set.