diff --git a/cluster/pulumi/common-validator/src/config.ts b/cluster/pulumi/common-validator/src/config.ts index bb778169b9..914b145dcd 100644 --- a/cluster/pulumi/common-validator/src/config.ts +++ b/cluster/pulumi/common-validator/src/config.ts @@ -3,6 +3,7 @@ import { DeployValidatorRunbook, EnvVarConfigSchema, + K8sResourceSchema, KmsConfigSchema, LogLevelSchema, } from '@lfdecentralizedtrust/splice-pulumi-common/src/config'; @@ -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({ @@ -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 }); diff --git a/cluster/pulumi/common-validator/src/participant.ts b/cluster/pulumi/common-validator/src/participant.ts index ef7ec48f29..29db013578 100644 --- a/cluster/pulumi/common-validator/src/participant.ts +++ b/cluster/pulumi/common-validator/src/participant.ts @@ -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, diff --git a/cluster/pulumi/common-validator/src/validator.ts b/cluster/pulumi/common-validator/src/validator.ts index fe5e935cf7..e10c30f475 100644 --- a/cluster/pulumi/common-validator/src/validator.ts +++ b/cluster/pulumi/common-validator/src/validator.ts @@ -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; @@ -178,8 +170,6 @@ export async function installValidatorApp( }, }; - const chartVersion = activeVersion; - return installSpliceHelmChart( config.xns, `validator-${config.xns.logicalName}`, @@ -248,7 +238,7 @@ export async function installValidatorApp( resources: baseConfig.svValidator ? config.resources : {}, ...spliceInstanceNames, }, - chartVersion, + activeVersion, { dependsOn } ); } diff --git a/cluster/pulumi/validator-runbook/src/installNode.ts b/cluster/pulumi/validator-runbook/src/installNode.ts index 71c321abab..2bc477d735 100644 --- a/cluster/pulumi/validator-runbook/src/installNode.ts +++ b/cluster/pulumi/validator-runbook/src/installNode.ts @@ -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