Skip to content

Commit 1fb4177

Browse files
[backport 0.4.10] Add additional env vars to scan (#2027) (#2042)
* Add additional env vars to scan (#2027) --------- Signed-off-by: Oriol Muñoz <[email protected]> (cherry picked from commit 97f46bc) * [static] run Signed-off-by: Oriol Muñoz <[email protected]> --------- Signed-off-by: Oriol Muñoz <[email protected]>
1 parent 549b438 commit 1fb4177

File tree

4 files changed

+15
-0
lines changed

4 files changed

+15
-0
lines changed

cluster/deployment/mock/config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ loadTester:
107107
chartVersion: 1.2.3
108108
svs:
109109
default:
110+
scanApp:
111+
additionalEnvVars:
112+
- name: CUSTOM_MOCK_ENV_VAR_NAME
113+
value: CUSTOM_MOCK_ENV_VAR_VALUE
110114
svApp:
111115
additionalEnvVars:
112116
- name: CUSTOM_MOCK_ENV_VAR_NAME

cluster/expected/canton-network/expected.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -846,6 +846,12 @@
846846
"namespace": "sv-1",
847847
"timeout": 600,
848848
"values": {
849+
"additionalEnvVars": [
850+
{
851+
"name": "CUSTOM_MOCK_ENV_VAR_NAME",
852+
"value": "CUSTOM_MOCK_ENV_VAR_VALUE"
853+
}
854+
],
849855
"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",
850856
"affinity": {
851857
"nodeAffinity": {

cluster/pulumi/canton-network/src/sv.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,7 @@ function installScan(
579579
: {}),
580580
enablePostgresMetrics: true,
581581
logLevel: config.logging?.appsLogLevel,
582+
additionalEnvVars: config.scanApp?.additionalEnvVars || [],
582583
...updateHistoryBackfillingValues,
583584
};
584585

cluster/pulumi/common-sv/src/singleSvConfig.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,17 @@ const SvParticipantConfigSchema = z.object({
2222
const SvAppConfigSchema = z.object({
2323
additionalEnvVars: z.array(EnvVarConfigSchema).default([]),
2424
});
25+
const ScanAppConfigSchema = z.object({
26+
additionalEnvVars: z.array(EnvVarConfigSchema).default([]),
27+
});
2528
// https://docs.cometbft.com/main/explanation/core/running-in-production
2629
const CometbftLogLevelSchema = z.enum(['info', 'error', 'debug', 'none']);
2730
const SingleSvConfigSchema = z
2831
.object({
2932
cometbft: SvCometbftConfigSchema.optional(),
3033
participant: SvParticipantConfigSchema.optional(),
3134
svApp: SvAppConfigSchema.optional(),
35+
scanApp: ScanAppConfigSchema.optional(),
3236
logging: z
3337
.object({
3438
appsLogLevel: LogLevelSchema,

0 commit comments

Comments
 (0)