Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 11 additions & 1 deletion cluster/pulumi/common-validator/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import {
DeployValidatorRunbook,
EnvVarConfigSchema,
K8sResourceSchema,
KmsConfigSchema,
LogLevelSchema,
} from '@lfdecentralizedtrust/splice-pulumi-common/src/config';
Expand Down Expand Up @@ -64,11 +65,20 @@ export const ValidatorAppConfigSchema = z.object({
additionalJvmOptions: z.string().optional(),
scanClient: ScanClientConfigSchema.optional(),
synchronizer: SynchronizerConfigSchema.optional(),
resources: K8sResourceSchema,
});

export const ParticipantConfigSchema = z.object({
additionalEnvVars: z.array(EnvVarConfigSchema).default([]),
additionalJvmOptions: z.string().optional(),
resources: K8sResourceSchema.default({
requests: {
memory: '4Gi',
},
limits: {
memory: '8Gi',
},
}),
});

export const ValidatorNodeConfigSchema = z.object({
Expand All @@ -86,7 +96,7 @@ export const ValidatorNodeConfigSchema = z.object({
retention: z.string(),
})
.optional(),
participant: ParticipantConfigSchema.optional(),
participant: ParticipantConfigSchema.default({}),
validatorApp: ValidatorAppConfigSchema.optional(),
disableAuth: z.boolean().default(false), // Note that this is currently ignored everywhere except for validator1, where it is used for testing only
});
Expand Down
9 changes: 1 addition & 8 deletions cluster/pulumi/common-validator/src/participant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,14 +104,7 @@ export function installParticipant(
validatorConfig.participant?.additionalEnvVars ?? []
),
enablePostgresMetrics: true,
resources: {
requests: {
memory: '4Gi',
},
limits: {
memory: '8Gi',
},
},
resources: validatorConfig.participant.resources,
disableAuth: disableAuth || false,
},
version,
Expand Down
12 changes: 1 addition & 11 deletions cluster/pulumi/common-validator/src/validator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,6 @@ export type ValidatorBackupConfig = {
config: BackupConfig;
};

export type ValidatorSecrets = {
validatorSecret: Secret;
legacyValidatorSecret?: Secret;
wallet: Secret;
cns: Secret;
auth0Client: Auth0Client;
};

type BasicValidatorConfig = {
xns: ExactNamespace;
topupConfig?: ValidatorTopupConfig;
Expand Down Expand Up @@ -178,8 +170,6 @@ export async function installValidatorApp(
},
};

const chartVersion = activeVersion;

return installSpliceHelmChart(
config.xns,
`validator-${config.xns.logicalName}`,
Expand Down Expand Up @@ -248,7 +238,7 @@ export async function installValidatorApp(
resources: baseConfig.svValidator ? config.resources : {},
...spliceInstanceNames,
},
chartVersion,
activeVersion,
{ dependsOn }
);
}
1 change: 1 addition & 0 deletions cluster/pulumi/validator-runbook/src/installNode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ async function installValidator(
maxVettingDelay: networkWideConfig?.maxVettingDelay,
additionalEnvVars: validatorConfig.validatorApp?.additionalEnvVars,
additionalJvmOptions: validatorConfig.validatorApp?.additionalJvmOptions,
resources: validatorConfig.validatorApp?.resources,
};

const validatorValuesWithOnboardingOverride = onboardingSecret
Expand Down