Skip to content

[backport 0.4.10] Add additional env vars to scan (#2027) #2042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 29, 2025
Merged

[backport 0.4.10] Add additional env vars to scan (#2027) #2042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
549ca2f
Add additional env vars to scan (#2027)
OriolMunoz-da Aug 27, 2025
9e082c3
[static] run
OriolMunoz-da Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cluster/deployment/mock/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions cluster/expected/canton-network/expected.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
1 change: 1 addition & 0 deletions cluster/pulumi/canton-network/src/sv.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,7 @@ function installScan(
: {}),
enablePostgresMetrics: true,
logLevel: config.logging?.appsLogLevel,
additionalEnvVars: config.scanApp?.additionalEnvVars || [],
...updateHistoryBackfillingValues,
};

Expand Down
4 changes: 4 additions & 0 deletions cluster/pulumi/common-sv/src/singleSvConfig.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,17 @@ 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
.object({
cometbft: SvCometbftConfigSchema.optional(),
participant: SvParticipantConfigSchema.optional(),
svApp: SvAppConfigSchema.optional(),
scanApp: ScanAppConfigSchema.optional(),
logging: z
.object({
appsLogLevel: LogLevelSchema,
Expand Down