Skip to content

Commit 0c2232a

Browse files
Always expose sv runbook cometbft port (#1198)
* Always expose sv runbook cometbft port fixes DACH-NY/cn-test-failures#4702 [static] Probably could be more clever here but doesn't seem worth the complexity and potential breakage. Signed-off-by: Moritz Kiefer <[email protected]> * Add missing dependency on splice-pulumi-common-sv [static] I hope this makes the pulumi operator happy again and fixes this ``` src/istio.ts(4,52): error TS2307: Cannot find module 'splice-pulumi-common-sv' or its corresponding type declarations. ``` Signed-off-by: Moritz Kiefer <[email protected]> * fmt [static] Signed-off-by: Moritz Kiefer <[email protected]> --------- Signed-off-by: Moritz Kiefer <[email protected]> Co-authored-by: Moritz Kiefer <[email protected]>
1 parent d54f7c6 commit 0c2232a

File tree

3 files changed

+11
-13
lines changed

3 files changed

+11
-13
lines changed

cluster/pulumi/infra/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
"@pulumi/auth0": "3.21.0",
66
"@pulumi/kubernetes-cert-manager": "0.2.0",
77
"@pulumiverse/grafana": "0.16.3",
8-
"splice-pulumi-common": "1.0.0"
8+
"splice-pulumi-common": "1.0.0",
9+
"splice-pulumi-common-sv": "1.0.0"
910
},
1011
"overrides": {
1112
"@pulumi/kubernetes-cert-manager": {

cluster/pulumi/infra/src/istio.ts

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { PodMonitor, ServiceMonitor } from 'splice-pulumi-common/src/metrics';
1010
import {
1111
activeVersion,
1212
DecentralizedSynchronizerUpgradeConfig,
13-
DeploySvRunbook,
1413
ExactNamespace,
1514
getDnsNames,
1615
HELM_MAX_HISTORY_SIZE,
@@ -160,16 +159,13 @@ function configureInternalGatewayService(
160159
// see notes when installing a CometBft node in the full deployment
161160
const cometBftIngressPorts = DecentralizedSynchronizerUpgradeConfig.runningMigrations()
162161
.map(migrationInfo => migrationInfo.id)
163-
.flatMap((domain: number) => {
164-
return (DeploySvRunbook ? [0] : [])
165-
.concat(Array.from(Array(dsoSize).keys()).map(n => n + 1))
166-
.map(node => {
167-
return ingressPort(
168-
`cometbft-${domain}-${node}-gw`,
169-
istioCometbftExternalPort(domain, node)
170-
);
171-
});
172-
});
162+
.flatMap((domain: number) =>
163+
// node = 0 is the sv runbook. We always include that as relying on SPLICE_DEPLOY_SV_RUNBOOK doesn't work well
164+
// for jobs where we deploy the sv runbook in a separate step so the core infra stack still runs with SPLICE_DEPLOY_SV_RUNBOOK=false.
165+
Array.from(Array(dsoSize + 1).keys()).map(node =>
166+
ingressPort(`cometbft-${domain}-${node}-gw`, istioCometbftExternalPort(domain, node))
167+
)
168+
);
173169
return configureGatewayService(
174170
ingressNs,
175171
ingressIp,

cluster/pulumi/package-lock.json

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)