File tree Expand file tree Collapse file tree 6 files changed +4
-33
lines changed
Expand file tree Collapse file tree 6 files changed +4
-33
lines changed Original file line number Diff line number Diff line change @@ -17,9 +17,6 @@ export PULUMI_STACKS_DIR="${SPLICE_ROOT}/cluster/stacks/mock"
1717
1818export PULUMI_BACKEND_URL=gs://da-cn-pulumi-dev-stacks
1919
20- export CHARTS_VERSION="0.3.20"
21- export OVERRIDE_VERSION="0.3.20"
22-
2320export ENABLE_SEQUENCER_PRUNING=true
2421export SEQUENCER_PRUNING_INTERVAL="1 hours"
2522export SEQUENCER_RETENTION_PERIOD="30 days"
Original file line number Diff line number Diff line change @@ -36,8 +36,4 @@ export APPROVE_SV_RUNBOOK=true
3636
3737# Upgrade workarounds, include a GH issue to remove them once the base version changes
3838
39- # TODO(DACH-NY/canton-network-node#14679): Remove
40- export VALIDATOR_RUNBOOK_POSTGRES_PVC_SIZE="240Gi"
41- export OVERRIDE_VERSION="0.4.0"
42- export CHARTS_VERSION="0.4.0"
4339export CACHE_DEV_DOCKER_REGISTRY=$DEV_DOCKER_REGISTRY
Original file line number Diff line number Diff line change @@ -112,9 +112,6 @@ export const svRunbookAuth0Config = {
112112export async function initDumpConfig ( ) : Promise < void > {
113113 // DO NOT ADD NON SECRET VALUES HERE, ALL THE VALUES SHOULD BE DEFINED BY THE CLUSTER ENVIRONMENT in .envrc.vars
114114 // THIS IS REQUIRED TO ENSURE THAT THE DEPLOYMENT OPERATOR HAS THE SAME ENV AS A LOCAL RUN
115- if ( ! process . env . OPERATOR_IMAGE_VERSION ) {
116- process . env . OPERATOR_IMAGE_VERSION = '0.0.1-deadbeef' ;
117- }
118115 process . env . AUTH0_CN_MANAGEMENT_API_CLIENT_ID = 'mgmt' ;
119116 process . env . AUTH0_CN_MANAGEMENT_API_CLIENT_SECRET = 's3cr3t' ;
120117 process . env . AUTH0_SV_MANAGEMENT_API_CLIENT_ID = 'mgmt' ;
Original file line number Diff line number Diff line change @@ -5,14 +5,14 @@ import * as pulumi from '@pulumi/pulumi';
55import _ from 'lodash' ;
66import {
77 appsAffinityAndTolerations ,
8- config ,
98 DOCKER_REPO ,
109 imagePullPolicy ,
1110 jmxOptions ,
1211 numNodesPerInstance ,
1312} from 'splice-pulumi-common' ;
1413import { ServiceMonitor } from 'splice-pulumi-common/src/metrics' ;
1514
15+ import { Version } from '../version' ;
1616import { EnvironmentVariable , multiValidatorConfig } from './config' ;
1717
1818export interface BaseMultiNodeArgs {
@@ -53,8 +53,6 @@ export class MultiNodeDeployment extends pulumi.ComponentResource {
5353
5454 const newOpts = { ...opts , parent : this , dependsOn : [ args . namespace ] } ;
5555 const zeroPad = ( num : number , places : number ) => String ( num ) . padStart ( places , '0' ) ;
56- const version =
57- config . optionalEnv ( 'MULTI_VALIDATOR_IMAGE_VERSION' ) || config . requireEnv ( 'CHARTS_VERSION' ) ;
5856 this . deployment = new k8s . apps . v1 . Deployment (
5957 name ,
6058 {
@@ -84,7 +82,7 @@ export class MultiNodeDeployment extends pulumi.ComponentResource {
8482 containers : [
8583 {
8684 name : args . imageName ,
87- image : `${ DOCKER_REPO } /${ args . imageName } :${ version } ` ,
85+ image : `${ DOCKER_REPO } /${ args . imageName } :${ Version } ` ,
8886 ...imagePullPolicy ,
8987 ...args . container ,
9088 ports : args . container . ports . concat ( [
Original file line number Diff line number Diff line change 11// Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
22// SPDX-License-Identifier: Apache-2.0
3- import { config , activeVersion } from 'splice-pulumi-common' ;
3+ import { activeVersion } from 'splice-pulumi-common' ;
44
5- const OPERATOR_IMAGE_VERSION = config . optionalEnv ( 'OPERATOR_IMAGE_VERSION' ) ;
6-
7- export const Version = OPERATOR_IMAGE_VERSION || versionFromDefault ( ) ;
5+ export const Version = versionFromDefault ( ) ;
86
97function versionFromDefault ( ) {
108 if ( activeVersion . type == 'remote' ) {
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments