diff --git a/cluster/deployment/mock/config.yaml b/cluster/deployment/mock/config.yaml index 389c53b5a7..e7fff91642 100644 --- a/cluster/deployment/mock/config.yaml +++ b/cluster/deployment/mock/config.yaml @@ -108,6 +108,10 @@ loadTester: chartVersion: 1.2.3 svs: default: + scanApp: + additionalEnvVars: + - name: CUSTOM_MOCK_ENV_VAR_NAME + value: CUSTOM_MOCK_ENV_VAR_VALUE svApp: additionalEnvVars: - name: CUSTOM_MOCK_ENV_VAR_NAME diff --git a/cluster/expected/canton-network/expected.json b/cluster/expected/canton-network/expected.json index c457433114..e95d4e0f89 100644 --- a/cluster/expected/canton-network/expected.json +++ b/cluster/expected/canton-network/expected.json @@ -1007,6 +1007,12 @@ "namespace": "sv-1", "timeout": 600, "values": { + "additionalEnvVars": [ + { + "name": "CUSTOM_MOCK_ENV_VAR_NAME", + "value": "CUSTOM_MOCK_ENV_VAR_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", "affinity": { "nodeAffinity": { diff --git a/cluster/pulumi/canton-network/src/sv.ts b/cluster/pulumi/canton-network/src/sv.ts index 27f28725a2..db9eb3efbe 100644 --- a/cluster/pulumi/canton-network/src/sv.ts +++ b/cluster/pulumi/canton-network/src/sv.ts @@ -580,6 +580,7 @@ function installScan( : {}), enablePostgresMetrics: true, logLevel: config.logging?.appsLogLevel, + additionalEnvVars: config.scanApp?.additionalEnvVars || [], ...updateHistoryBackfillingValues, }; diff --git a/cluster/pulumi/common-sv/src/singleSvConfig.ts b/cluster/pulumi/common-sv/src/singleSvConfig.ts index 66eaf123f9..71ee49b05e 100644 --- a/cluster/pulumi/common-sv/src/singleSvConfig.ts +++ b/cluster/pulumi/common-sv/src/singleSvConfig.ts @@ -22,6 +22,9 @@ const SvParticipantConfigSchema = z.object({ const SvAppConfigSchema = z.object({ additionalEnvVars: z.array(EnvVarConfigSchema).default([]), }); +const ScanAppConfigSchema = z.object({ + additionalEnvVars: z.array(EnvVarConfigSchema).default([]), +}); // https://docs.cometbft.com/main/explanation/core/running-in-production const CometbftLogLevelSchema = z.enum(['info', 'error', 'debug', 'none']); const SingleSvConfigSchema = z @@ -29,6 +32,7 @@ const SingleSvConfigSchema = z cometbft: SvCometbftConfigSchema.optional(), participant: SvParticipantConfigSchema.optional(), svApp: SvAppConfigSchema.optional(), + scanApp: ScanAppConfigSchema.optional(), logging: z .object({ appsLogLevel: LogLevelSchema,