[static] Remove charts version and override version (#1218)

Author: nicu-da

.github/actions/scripts/backport_reminder.js

@@ -16,14 +16,8 @@ async function getBranchesForCluster(deps, cluster) {
   const upgrade = config.synchronizerMigration.upgrade?.releaseReference.gitReference;
   const archived = config.synchronizerMigration.archived?.map((a) => a.releaseReference?.gitReference);
 
-  const envrc = await getFileFromGit(deps, `cluster/deployment/${cluster}/.envrc.vars`, 'main');
-  const regex = /export OVERRIDE_VERSION=["]?[0-9]+.[0-9]+.[0-9]+["]?/g;
-  const overrideVersion = envrc.match(regex)[0];
-  const cnVersion = overrideVersion.split('=')[1].replaceAll('"', '');
-  const cnVersionBranch = `refs/heads/release-line-${cnVersion}`;
-
   return {
-    cnVersion: cnVersionBranch,
+    cnVersion: active,
     active,
     upgrade,
     archived

build-tools/get-charts-version

@@ -52,7 +52,7 @@ EOF
   _update_cluster_config "$migration_config" "synchronizerMigration.$migration_type"
 }
 
-subcommand_whitelist[update_active_version]='Upgrade the version of the active migration id including CHARTS_VERSION'
+subcommand_whitelist[update_active_version]='Upgrade the version of the active migration id'
 
 function subcmd_update_active_version() {
     local cluster_directory
@@ -66,8 +66,6 @@ function subcmd_update_active_version() {
     else
         cluster_directory="${DEPLOYMENT_DIR}/${TARGET_CLUSTER}"
     fi
-    set -x
-    sed -i "s/^export CHARTS_VERSION=.*$/export CHARTS_VERSION=\"$1\"/" "$cluster_directory/.envrc.vars"
 }
 
 subcommand_whitelist[update_config_to_migrate]='Upgrade the cluster config.yaml to migrate cluster'

build-tools/lib/hard-domain-migration-commands

@@ -276,8 +276,6 @@ function subcmd_ci_apply_sv() {
        _info "Bootstrapping SV from ${BOOTSTRAPPING_CONFIG}"
     fi
 
-    local -x CHARTS_VERSION="${1-}"
-
     _uses_pulumi_stack sv-runbook
 
     subcmd_install_data_export_bucket_key
@@ -358,8 +356,6 @@ function subcmd_ci_apply_validator() {
        _info "Bootstrapping Validator from ${BOOTSTRAPPING_CONFIG}"
     fi
 
-    local -x CHARTS_VERSION="${1-}"
-
     _uses_pulumi_stack validator-runbook
 
     subcmd_install_data_export_bucket_key
@@ -401,11 +397,6 @@ function subcmd_apply_multi() {
     _prompt_to_confirm
     _cluster_must_exist
 
-    if [ -z "${MULTI_VALIDATOR_IMAGE_VERSION:-}" ]; then
-        MULTI_VALIDATOR_IMAGE_VERSION=$(get-snapshot-version)
-        export MULTI_VALIDATOR_IMAGE_VERSION
-    fi
-
     _uses_pulumi_stack multi-validator
     subcmd_pulumi multi-validator up --yes --skip-preview --show-sames "${args[@]}"
 }

build-tools/lib/pulumi-commands

@@ -51,10 +51,6 @@ function _resolve_pulumi_stack() {
 }
 
 function _cluster_reset() {
-    # not used but required to pass config validation
-    if [ -z "${CHARTS_VERSION:-}" ]; then
-        export CHARTS_VERSION="local"
-    fi
     _info "Uninstalling Pulumi canton-network and runbook stacks"
 
     _pulumi_automation_run_down

build-tools/lib/pulumi-helpers

@@ -1,6 +1,5 @@
 // Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { spliceEnvConfig } from './config/envConfig';
 
 export type CnChartVersion =
   | { type: 'local' }
@@ -17,5 +16,3 @@ export function parsedVersion(version: string | undefined): CnChartVersion {
       }
     : { type: 'local' };
 }
-
-export const CHARTS_VERSION: string | undefined = spliceEnvConfig.optionalEnv('CHARTS_VERSION');

cluster/pulumi/common/src/artifacts.ts

@@ -1,34 +1,29 @@
 // Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
 // SPDX-License-Identifier: Apache-2.0
-import * as _ from 'lodash';
-import * as util from 'node:util';
 import { z } from 'zod';
 
-import { CHARTS_VERSION, CnChartVersion, parsedVersion } from '../artifacts';
+import { CnChartVersion, parsedVersion } from '../artifacts';
 import { spliceEnvConfig } from './envConfig';
 
 export const defaultActiveMigration = {
   id: 0,
-  version: CHARTS_VERSION,
+  version: 'local',
   sequencer: {
     enableBftSequencer: false,
   },
 };
 
-const migrationVersion = z
-  .string()
-  .optional()
-  .transform<CnChartVersion>((version, ctx) => {
-    if (!version && !CHARTS_VERSION && spliceEnvConfig.optionalEnv('SPLICE_OPERATOR_DEPLOYMENT')) {
-      ctx.addIssue({
-        code: z.ZodIssueCode.custom,
-        message: `No active version or CHARTS_VERSION specified`,
-      });
-      return z.NEVER;
-    } else {
-      return parsedVersion(version || CHARTS_VERSION);
-    }
-  });
+const migrationVersion = z.string().transform<CnChartVersion>((version, ctx) => {
+  if (version == 'local' && spliceEnvConfig.optionalEnv('SPLICE_OPERATOR_DEPLOYMENT')) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: `Using a local version for the operator deployment is not supported.`,
+    });
+    return z.NEVER;
+  } else {
+    return parsedVersion(version);
+  }
+});
 
 export const GitReferenceSchema = z.object({
   repoUrl: z.string(),
@@ -63,18 +58,7 @@ export const SynchronizerMigrationSchema = z
     legacy: MigrationInfoSchema.optional(),
     active: MigrationInfoSchema.extend({
       migratingFrom: z.number().optional(),
-      version: migrationVersion.transform((version, ctx) => {
-        const parsedChartsVersion = parsedVersion(CHARTS_VERSION);
-        if (CHARTS_VERSION && !_.isEqual(parsedChartsVersion, version)) {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            message: `Specified different active version and CHARTS_VERSION: ${util.inspect(version)} - ${util.inspect(parsedChartsVersion)}`,
-          });
-          return z.NEVER;
-        } else {
-          return version;
-        }
-      }),
+      version: migrationVersion,
     })
       .strict()
       .default(defaultActiveMigration),