Support additionalEnvVars and jvm options in validator-runbook (#2429)

Needed to play around with topology batch size parameters for party scaling.


---------

Signed-off-by: Moritz Kiefer <[email protected]>
Co-authored-by: Moritz Kiefer <[email protected]>

Author: moritzkiefer-da

cluster/deployment/mock/config.yaml

@@ -205,6 +205,12 @@ cluster:
 networkWide:
   maxVettingDelay: 1m
 validators:
+  validator-runbook:
+    participant:
+      additionalEnvVars:
+        - name: ADDITIONAL_ENV_VAR_VALIDATOR_PARTICIPANT_NAME
+          value: ADDITIONAL_ENV_VAR_VALIDATOR_PARTICIPANT_VALUE
+      additionalJvmOptions: -Dparticipantoption
   extra-validator:
     namespace: validator
     partyHint: 'extra-validator'

cluster/expected/splitwell/expected.json

@@ -528,6 +528,7 @@
       "namespace": "splitwell",
       "timeout": 600,
       "values": {
+        "additionalEnvVars": [],
         "additionalJvmOptions": "-Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.rmi.port=9010 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=127.0.0.1",
         "affinity": {
           "nodeAffinity": {

cluster/expected/validator-runbook/expected.json

@@ -415,7 +415,13 @@
       "namespace": "validator",
       "timeout": 600,
       "values": {
-        "additionalJvmOptions": "-Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.rmi.port=9010 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=127.0.0.1",
+        "additionalEnvVars": [
+          {
+            "name": "ADDITIONAL_ENV_VAR_VALIDATOR_PARTICIPANT_NAME",
+            "value": "ADDITIONAL_ENV_VAR_VALIDATOR_PARTICIPANT_VALUE"
+          }
+        ],
+        "additionalJvmOptions": "-Dcom.sun.management.jmxremote=true -Dcom.sun.management.jmxremote.port=9010 -Dcom.sun.management.jmxremote.rmi.port=9010 -Dcom.sun.management.jmxremote.local.only=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -Djava.rmi.server.hostname=127.0.0.1 -Dparticipantoption",
         "affinity": {
           "nodeAffinity": {
             "requiredDuringSchedulingIgnoredDuringExecution": {

cluster/pulumi/common-validator/src/config.ts

@@ -2,12 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 import {
   DeployValidatorRunbook,
+  EnvVarConfigSchema,
   KmsConfigSchema,
   LogLevelSchema,
 } from '@lfdecentralizedtrust/splice-pulumi-common/src/config';
 import { clusterSubConfig } from '@lfdecentralizedtrust/splice-pulumi-common/src/config/configLoader';
 import { z } from 'zod';
 
+export const ParticipantConfigSchema = z.object({
+  additionalEnvVars: z.array(EnvVarConfigSchema).default([]),
+  additionalJvmOptions: z.string().optional(),
+});
+
 export const ValidatorNodeConfigSchema = z.object({
   logging: z
     .object({
@@ -22,6 +28,7 @@ export const ValidatorNodeConfigSchema = z.object({
       retention: z.string(),
     })
     .optional(),
+  participant: ParticipantConfigSchema.optional(),
 });
 export type ValidatorNodeConfig = z.infer<typeof ValidatorNodeConfigSchema>;
 export const ValidatorConfigSchema = z

cluster/pulumi/common-validator/src/participant.ts

@@ -9,9 +9,9 @@ import {
   DEFAULT_AUDIENCE,
   DomainMigrationIndex,
   ExactNamespace,
+  getAdditionalJvmOptions,
   getParticipantKmsHelmResources,
   installSpliceHelmChart,
-  jmxOptions,
   loadYamlFromFile,
   sanitizedForPostgres,
   SPLICE_ROOT,
@@ -87,7 +87,12 @@ export function installParticipant(
           active: true,
         },
       },
-      additionalJvmOptions: jmxOptions(),
+      additionalJvmOptions: getAdditionalJvmOptions(
+        validatorConfig.participant?.additionalJvmOptions
+      ),
+      additionalEnvVars: (participantValuesWithSpecifiedAud.additionalEnvVars ?? []).concat(
+        validatorConfig.participant?.additionalEnvVars ?? []
+      ),
       enablePostgresMetrics: true,
       resources: {
         requests: {

cluster/pulumi/common/src/config/configSchema.ts

@@ -56,3 +56,8 @@ export const K8sResourceSchema = z
     requests: SingleResourceSchema,
   })
   .optional();
+
+export const EnvVarConfigSchema = z.object({
+  name: z.string(),
+  value: z.string(),
+});