Only filter cometbft ports by migrations (#1201)

* Revert "Add missing dependency on splice-pulumi-common-sv (#1196)"

This reverts commit 21c4bfb.

Signed-off-by: Moritz Kiefer <[email protected]>

* Revert "[release-line-0.3.21] Limit cometbft load balancer ports to only those actually used (#1191)"

This reverts commit 119434e.

Signed-off-by: Moritz Kiefer <[email protected]>

* Only filter cometbft ports by migrations

Changing the dependency structure is too much of a mess and this seems
good enough.

[static]

Signed-off-by: Moritz Kiefer <[email protected]>

---------

Signed-off-by: Moritz Kiefer <[email protected]>
Co-authored-by: Moritz Kiefer <[email protected]>

Author: moritzkiefer-da

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

@@ -35,7 +35,7 @@ export class CometBftNodeConfigs {
       privateKey: staticConf.privateKey,
       identifier: this.nodeIdentifier,
       externalAddress: this.p2pExternalAddress(staticConf.nodeIndex),
-      istioPort: istioCometbftExternalPort(this._domainMigrationId, staticConf.nodeIndex),
+      istioPort: this.istioExternalPort(staticConf.nodeIndex),
       retainBlocks: staticConf.retainBlocks,
       validator: staticConf.validator,
     };
@@ -80,13 +80,13 @@ export class CometBftNodeConfigs {
   }
 
   private p2pExternalAddress(nodeIndex: number): string {
-    return `${CLUSTER_HOSTNAME}:${istioCometbftExternalPort(this._domainMigrationId, nodeIndex)}`;
+    return `${CLUSTER_HOSTNAME}:${this.istioExternalPort(nodeIndex)}`;
   }
-}
 
-export const istioCometbftExternalPort = (migrationId: number, nodeIndex: number): number => {
-  // TODO(DACH-NY/canton-network-node#10482) Revisit port scheme
-  return nodeIndex >= 10
-    ? Number(`26${migrationId}${nodeIndex}`)
-    : Number(`26${migrationId}${nodeIndex}6`);
-};
+  private istioExternalPort(nodeIndex: number) {
+    // TODO(#10482) Revisit port scheme
+    return nodeIndex >= 10
+      ? Number(`26${this._domainMigrationId}${nodeIndex}`)
+      : Number(`26${this._domainMigrationId}${nodeIndex}6`);
+  }
+}

cluster/pulumi/infra/package.json

@@ -6,8 +6,7 @@
     "@pulumi/command": "1.1.0",
     "@pulumi/kubernetes-cert-manager": "0.2.0",
     "@pulumiverse/grafana": "0.16.3",
-    "splice-pulumi-common": "1.0.0",
-    "splice-pulumi-common-sv": "1.0.0"
+    "splice-pulumi-common": "1.0.0"
   },
   "overrides": {
     "@pulumi/kubernetes-cert-manager": {

cluster/pulumi/infra/src/istio.ts

@@ -1,13 +1,11 @@
 import * as k8s from '@pulumi/kubernetes';
 import * as pulumi from '@pulumi/pulumi';
 import { local } from '@pulumi/command';
-import { dsoSize, istioCometbftExternalPort } from 'splice-pulumi-common-sv';
 import { PodMonitor, ServiceMonitor } from 'splice-pulumi-common/src/metrics';
 
 import {
   activeVersion,
   DecentralizedSynchronizerUpgradeConfig,
-  DeploySvRunbook,
   ExactNamespace,
   getDnsNames,
   HELM_MAX_HISTORY_SIZE,
@@ -161,16 +159,11 @@ function configureInternalGatewayService(
   const externalIPRanges = loadIPRanges();
   // see notes when installing a CometBft node in the full deployment
   const cometBftIngressPorts = DecentralizedSynchronizerUpgradeConfig.runningMigrations()
-    .map(migrationInfo => migrationInfo.id)
+    .map(m => m.id)
     .flatMap((domain: number) => {
-      return (DeploySvRunbook ? [0] : [])
-        .concat(Array.from(Array(dsoSize).keys()).map(n => n + 1))
-        .map(node => {
-          return ingressPort(
-            `cometbft-${domain}-${node}-gw`,
-            istioCometbftExternalPort(domain, node)
-          );
-        });
+      return Array.from(Array(10).keys()).map(node => {
+        return ingressPort(`cometbft-${domain}-${node}-gw`, Number(`26${domain}${node}6`));
+      });
     });
   return configureGatewayService(
     ingressNs,