extra volume snapshot to common file

[static]

Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>

Author: nicu-da

cluster/pulumi/common-sv/src/synchronizer/cometbft.ts

@@ -9,6 +9,7 @@ import {
   CLUSTER_HOSTNAME,
   clusterSmallDisk,
   config,
+  createVolumeSnapshot,
   DomainMigrationIndex,
   ExactNamespace,
   InstalledHelmChart,
@@ -23,7 +24,6 @@ import {
 } from '@lfdecentralizedtrust/splice-pulumi-common';
 import { CnChartVersion } from '@lfdecentralizedtrust/splice-pulumi-common/src/artifacts';
 import { hyperdiskSupportConfig } from '@lfdecentralizedtrust/splice-pulumi-common/src/config/hyperdiskSupportConfig';
-import { CustomResource } from '@pulumi/kubernetes/apiextensions';
 import { jsonStringify, Output } from '@pulumi/pulumi';
 
 import { svsConfig } from '../config';
@@ -112,30 +112,15 @@ export function installCometBftNode(
       volumeStorageClass: standardStorageClassName,
     };
     if (hyperdiskSupportConfig.hyperdiskSupport.migrating) {
-      const pvcSnapshot = new CustomResource(
-        `cometbft-${xns.logicalName}-migration-${migrationId}-snapshot`,
-        {
-          apiVersion: 'snapshot.storage.k8s.io/v1',
-          kind: 'VolumeSnapshot',
-          metadata: {
-            name: `cometbft-migration-${migrationId}-pd-snapshot`,
-            namespace: xns.logicalName,
-          },
-          spec: {
-            volumeSnapshotClassName: 'dev-vsc',
-            source: {
-              persistentVolumeClaimName: `global-domain-${migrationId}-cometbft-cometbft-data`,
-            },
-          },
-        }
-      );
+      const { dataSource } = createVolumeSnapshot({
+        resourceName: `cometbft-${xns.logicalName}-migration-${migrationId}-snapshot`,
+        snapshotName: `cometbft-migration-${migrationId}-pd-snapshot`,
+        namespace: xns.logicalName,
+        pvcName: `global-domain-${migrationId}-cometbft-cometbft-data`,
+      });
       hyperdiskDbValues = {
         ...hyperdiskDbValues,
-        dataSource: {
-          kind: 'VolumeSnapshot',
-          name: pvcSnapshot.metadata.name,
-          apiGroup: 'snapshot.storage.k8s.io',
-        },
+        dataSource,
       };
     }
   }

cluster/pulumi/common/src/config/hyperdiskSupportConfig.ts

@@ -8,7 +8,9 @@ const HyperdiskSupportConfigSchema = z.object({
   hyperdiskSupport: z
     .object({
       enabled: z.boolean().default(false),
+      enabledForInfra: z.boolean().default(false),
       migrating: z.boolean().default(false),
+      migratingInfra: z.boolean().default(false),
     })
     .default({}),
 });

cluster/pulumi/common/src/index.ts

@@ -30,3 +30,4 @@ export * from './config/networkWideConfig';
 export * from './ratelimit';
 export * from './config/config';
 export * from './storage/storageClass';
+export * from './storage/volumeSnapshot';

cluster/pulumi/common/src/postgres.ts

@@ -4,7 +4,6 @@ import * as gcp from '@pulumi/gcp';
 import * as pulumi from '@pulumi/pulumi';
 import * as random from '@pulumi/random';
 import * as _ from 'lodash';
-import { CustomResource } from '@pulumi/kubernetes/apiextensions';
 import { Resource } from '@pulumi/pulumi';
 
 import { CnChartVersion } from './artifacts';
@@ -18,6 +17,7 @@ import {
 } from './helm';
 import { installPostgresPasswordSecret } from './secrets';
 import { standardStorageClassName } from './storage/storageClass';
+import { createVolumeSnapshot } from './storage/volumeSnapshot';
 import { ChartValues, CLUSTER_BASENAME, ExactNamespace, GCP_ZONE } from './utils';
 
 const project = gcp.organizations.getProjectOutput({});
@@ -227,34 +227,22 @@ export class SplicePostgres extends pulumi.ComponentResource implements Postgres
 
     // an initial database named cantonnet is created automatically (configured in the Helm chart).
     const smallDiskSize = clusterSmallDisk ? '240Gi' : undefined;
-    const supportsHyperdisk =
-      hyperdiskSupportConfig.hyperdiskSupport.enabled && !useInfraAffinityAndTolerations;
+    const supportsHyperdisk = useInfraAffinityAndTolerations
+      ? hyperdiskSupportConfig.hyperdiskSupport.enabledForInfra
+      : hyperdiskSupportConfig.hyperdiskSupport.enabled;
+    const migratingToHyperdisk = useInfraAffinityAndTolerations
+      ? hyperdiskSupportConfig.hyperdiskSupport.migratingInfra
+      : hyperdiskSupportConfig.hyperdiskSupport.migrating;
+
     let hyperdiskMigrationValues = {};
-    if (supportsHyperdisk && hyperdiskSupportConfig.hyperdiskSupport.migrating) {
-      const pvcSnapshot = new CustomResource(
-        `pg-data-${xns.logicalName}-${instanceName}-snapshot`,
-        {
-          apiVersion: 'snapshot.storage.k8s.io/v1',
-          kind: 'VolumeSnapshot',
-          metadata: {
-            name: `pg-data-${instanceName}-snapshot`,
-            namespace: xns.logicalName,
-          },
-          spec: {
-            volumeSnapshotClassName: 'dev-vsc',
-            source: {
-              persistentVolumeClaimName: `pg-data-${instanceName}-0`,
-            },
-          },
-        }
-      );
-      hyperdiskMigrationValues = {
-        dataSource: {
-          kind: 'VolumeSnapshot',
-          name: pvcSnapshot.metadata.name,
-          apiGroup: 'snapshot.storage.k8s.io',
-        },
-      };
+    if (supportsHyperdisk && migratingToHyperdisk) {
+      const { dataSource } = createVolumeSnapshot({
+        resourceName: `pg-data-${xns.logicalName}-${instanceName}-snapshot`,
+        snapshotName: `pg-data-${instanceName}-snapshot`,
+        namespace: xns.logicalName,
+        pvcName: `pg-data-${instanceName}-0`,
+      });
+      hyperdiskMigrationValues = { dataSource };
     }
     const pg = installSpliceHelmChart(
       xns,
@@ -284,7 +272,7 @@ export class SplicePostgres extends pulumi.ComponentResource implements Postgres
         ...((supportsHyperdisk &&
           // during the migration we first delete the stateful set, which keeps the old pvcs (stateful sets always keep the pvcs), and then recreate with the new pvcs
           // the stateful sets are immutable so they need to be recreated to force the change of the pvcs
-          hyperdiskSupportConfig.hyperdiskSupport.migrating) ||
+          migratingToHyperdisk) ||
         spliceConfig.pulumiProjectConfig.replacePostgresStatefulSetOnChanges
           ? {
               replaceOnChanges: ['*'],

cluster/pulumi/common/src/storage/volumeSnapshot.ts

@@ -0,0 +1,47 @@
+// Copyright (c) 2024 Digital Asset (Switzerland) GmbH and/or its affiliates. All rights reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { CustomResource } from '@pulumi/kubernetes/apiextensions';
+import { Output } from '@pulumi/pulumi';
+
+export interface VolumeSnapshotOptions {
+  resourceName: string;
+  snapshotName: string;
+  namespace: string;
+  pvcName: string;
+  volumeSnapshotClassName?: string;
+}
+export function createVolumeSnapshot(options: VolumeSnapshotOptions): {
+  snapshot: CustomResource;
+  dataSource: { kind: string; name: Output<string>; apiGroup: string };
+} {
+  const {
+    resourceName,
+    snapshotName,
+    namespace,
+    pvcName,
+    volumeSnapshotClassName = 'dev-vsc',
+  } = options;
+
+  const snapshot = new CustomResource(resourceName, {
+    apiVersion: 'snapshot.storage.k8s.io/v1',
+    kind: 'VolumeSnapshot',
+    metadata: {
+      name: snapshotName,
+      namespace: namespace,
+    },
+    spec: {
+      volumeSnapshotClassName: volumeSnapshotClassName,
+      source: {
+        persistentVolumeClaimName: pvcName,
+      },
+    },
+  });
+
+  const dataSource = {
+    kind: 'VolumeSnapshot',
+    name: snapshot.metadata.name,
+    apiGroup: 'snapshot.storage.k8s.io',
+  };
+
+  return { snapshot, dataSource };
+}

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

@@ -12,8 +12,8 @@ import {
   installSpliceRunbookHelmChart,
   spliceConfig,
   standardStorageClassName,
+  createVolumeSnapshot,
 } from '@lfdecentralizedtrust/splice-pulumi-common';
-import { CustomResource } from '@pulumi/kubernetes/apiextensions';
 
 import { hyperdiskSupportConfig } from '../../common/src/config/hyperdiskSupportConfig';
 import { multiValidatorConfig } from './config';
@@ -41,27 +41,13 @@ export function installPostgres(
     hyperdiskSupportConfig.hyperdiskSupport.enabled &&
     hyperdiskSupportConfig.hyperdiskSupport.migrating
   ) {
-    const pvcSnapshot = new CustomResource(`pg-data-${xns.logicalName}-${name}-snapshot`, {
-      apiVersion: 'snapshot.storage.k8s.io/v1',
-      kind: 'VolumeSnapshot',
-      metadata: {
-        name: `pg-data-${name}-snapshot`,
-        namespace: xns.logicalName,
-      },
-      spec: {
-        volumeSnapshotClassName: 'dev-vsc',
-        source: {
-          persistentVolumeClaimName: `pg-data-${name}-0`,
-        },
-      },
+    const { dataSource } = createVolumeSnapshot({
+      resourceName: `pg-data-${xns.logicalName}-${name}-snapshot`,
+      snapshotName: `pg-data-${name}-snapshot`,
+      namespace: xns.logicalName,
+      pvcName: `pg-data-${name}-0`,
     });
-    hyperdiskMigrationValues = {
-      dataSource: {
-        kind: 'VolumeSnapshot',
-        name: pvcSnapshot.metadata.name,
-        apiGroup: 'snapshot.storage.k8s.io',
-      },
-    };
+    hyperdiskMigrationValues = { dataSource };
   }
   return installSpliceRunbookHelmChart(
     xns,