Skip to content

Commit 548cc8f

Browse files
authored
remove static name for nodepools and upgrade pulumi gcp plugin (#3616)
Signed-off-by: Nicu Reut <nicu.reut@digitalasset.com>
1 parent c905351 commit 548cc8f

File tree

9 files changed

+173
-264
lines changed

9 files changed

+173
-264
lines changed

cluster/expected/cluster/expected.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
},
1010
"cluster": "cn-mocknet",
1111
"initialNodeCount": 0,
12-
"name": "cn-apps-pool",
1312
"nodeConfig": {
1413
"labels": {
1514
"cn_apps": "true"
@@ -38,7 +37,6 @@
3837
},
3938
"cluster": "cn-mocknet",
4039
"initialNodeCount": 1,
41-
"name": "cn-infra-pool",
4240
"nodeConfig": {
4341
"labels": {
4442
"cn_infra": "true"

cluster/pulumi/canton-network/src/bigQuery.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,9 @@ function installDatastreamToNatVmFirewallRule(
400400
ports: [dbPort.toString()],
401401
},
402402
],
403-
sourceRanges: [source.vpcPeeringConfig.subnet],
403+
sourceRanges: source.vpcPeeringConfig.apply(peeringConfig =>
404+
peeringConfig ? [peeringConfig.subnet] : []
405+
),
404406
destinationRanges: [natVm.networkInterfaces[0].networkIp],
405407
});
406408
}

cluster/pulumi/cluster/src/nodePools.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ export function installNodePools(): void {
1212
: clusterName;
1313

1414
new gcp.container.NodePool('cn-apps-node-pool', {
15-
name: 'cn-apps-pool',
1615
cluster,
1716
nodeConfig: {
1817
machineType: gkeClusterConfig.nodePools.apps.nodeType,
@@ -35,7 +34,6 @@ export function installNodePools(): void {
3534
});
3635

3736
new gcp.container.NodePool('cn-infra-node-pool', {
38-
name: 'cn-infra-pool',
3937
cluster,
4038
nodeConfig: {
4139
machineType: gkeClusterConfig.nodePools.infra.nodeType,

cluster/pulumi/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"@google-cloud/storage": "^7.18.0",
77
"@kubernetes/client-node": "^0.22.3",
88
"@pulumi/command": "1.1.0",
9-
"@pulumi/gcp": "8.32.1",
9+
"@pulumi/gcp": "^9.10.0",
1010
"@pulumi/kubernetes": "4.23.0",
1111
"@pulumi/pulumi": "3.202.0",
1212
"@pulumi/random": "4.18.2",

cluster/pulumi/infra/package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
"@pulumi/auth0": "3.21.0",
66
"@pulumi/kubernetes-cert-manager": "0.2.0",
77
"@pulumiverse/grafana": "0.16.3",
8-
"@lfdecentralizedtrust/splice-pulumi-common": "1.0.0",
9-
"@pulumi/gcp": "8.32.1"
8+
"@lfdecentralizedtrust/splice-pulumi-common": "1.0.0"
109
},
1110
"overrides": {
1211
"@pulumi/kubernetes-cert-manager": {

cluster/pulumi/package-lock.json

Lines changed: 149 additions & 67 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cluster/pulumi/policies/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"@pulumi/kubernetes-cert-manager": "0.2.0",
66
"@pulumiverse/grafana": "0.16.3",
77
"@lfdecentralizedtrust/splice-pulumi-common": "1.0.0",
8-
"@pulumi/gcp": "8.32.1",
8+
"@pulumi/gcp": "^9.10.0",
99
"@pulumi/policy": "1.20.0"
1010
},
1111
"overrides": {

0 commit comments

Comments
 (0)