From 549ca2fb772812e4ae98c1ab81afc9e929685c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oriol=20Mu=C3=B1oz?= Date: Wed, 27 Aug 2025 13:54:49 +0200 Subject: [PATCH 1/2] Add additional env vars to scan (#2027) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --------- Signed-off-by: Oriol Muñoz (cherry picked from commit 97f46bc221220084872710578feca87f02aa2e87) --- cluster/deployment/mock/config.yaml | 4 ++++ cluster/expected/canton-network/expected.json | 6 ++++++ cluster/pulumi/canton-network/src/sv.ts | 1 + cluster/pulumi/common-sv/src/singleSvConfig.ts | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/cluster/deployment/mock/config.yaml b/cluster/deployment/mock/config.yaml index 0d7a9ee7cd..d257fdaa4c 100644 --- a/cluster/deployment/mock/config.yaml +++ b/cluster/deployment/mock/config.yaml @@ -107,6 +107,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 0a71804491..caaafd79f9 100644 --- a/cluster/expected/canton-network/expected.json +++ b/cluster/expected/canton-network/expected.json @@ -846,6 +846,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 1a86a88915..590e6a2836 100644 --- a/cluster/pulumi/canton-network/src/sv.ts +++ b/cluster/pulumi/canton-network/src/sv.ts @@ -579,6 +579,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 4d4fc69315..a8b84651d2 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, From 9e082c30230f6fcb8959cd48c9fdd4923f16f0ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oriol=20Mu=C3=B1oz?= Date: Thu, 28 Aug 2025 16:15:23 +0000 Subject: [PATCH 2/2] [static] run MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Oriol Muñoz