Skip to content

Commit 420bb94

Browse files
authored
[static] Remove custom versions for the pulumi operator and multi validators (#1209)
1 parent 9fce57c commit 420bb94

File tree

6 files changed

+4
-33
lines changed

6 files changed

+4
-33
lines changed

cluster/deployment/mock/.envrc.vars

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ export PULUMI_STACKS_DIR="${SPLICE_ROOT}/cluster/stacks/mock"
1717

1818
export 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-
2320
export ENABLE_SEQUENCER_PRUNING=true
2421
export SEQUENCER_PRUNING_INTERVAL="1 hours"
2522
export SEQUENCER_RETENTION_PERIOD="30 days"

cluster/deployment/scratchnetd/.envrc.vars

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff 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"
4339
export CACHE_DEV_DOCKER_REGISTRY=$DEV_DOCKER_REGISTRY

cluster/pulumi/common/src/dump-config-common.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ export const svRunbookAuth0Config = {
112112
export 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';

cluster/pulumi/multi-validator/src/multiNodeDeployment.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ import * as pulumi from '@pulumi/pulumi';
55
import _ from 'lodash';
66
import {
77
appsAffinityAndTolerations,
8-
config,
98
DOCKER_REPO,
109
imagePullPolicy,
1110
jmxOptions,
1211
numNodesPerInstance,
1312
} from 'splice-pulumi-common';
1413
import { ServiceMonitor } from 'splice-pulumi-common/src/metrics';
1514

15+
import { Version } from '../version';
1616
import { EnvironmentVariable, multiValidatorConfig } from './config';
1717

1818
export 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([
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
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

97
function versionFromDefault() {
108
if (activeVersion.type == 'remote') {

cluster/pulumi/operator/src/version.ts

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)