Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions cluster/expected/cluster/expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
},
"cluster": "cn-mocknet",
"initialNodeCount": 0,
"name": "cn-apps-pool",
"nodeConfig": {
"labels": {
"cn_apps": "true"
Expand Down Expand Up @@ -38,7 +37,6 @@
},
"cluster": "cn-mocknet",
"initialNodeCount": 1,
"name": "cn-infra-pool",
"nodeConfig": {
"labels": {
"cn_infra": "true"
Expand Down
4 changes: 3 additions & 1 deletion cluster/pulumi/canton-network/src/bigQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,9 @@ function installDatastreamToNatVmFirewallRule(
ports: [dbPort.toString()],
},
],
sourceRanges: [source.vpcPeeringConfig.subnet],
sourceRanges: source.vpcPeeringConfig.apply(peeringConfig =>
peeringConfig ? [peeringConfig.subnet] : []
),
destinationRanges: [natVm.networkInterfaces[0].networkIp],
});
}
Expand Down
2 changes: 0 additions & 2 deletions cluster/pulumi/cluster/src/nodePools.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export function installNodePools(): void {
: clusterName;

new gcp.container.NodePool('cn-apps-node-pool', {
name: 'cn-apps-pool',
cluster,
nodeConfig: {
machineType: gkeClusterConfig.nodePools.apps.nodeType,
Expand All @@ -35,7 +34,6 @@ export function installNodePools(): void {
});

new gcp.container.NodePool('cn-infra-node-pool', {
name: 'cn-infra-pool',
cluster,
nodeConfig: {
machineType: gkeClusterConfig.nodePools.infra.nodeType,
Expand Down
2 changes: 1 addition & 1 deletion cluster/pulumi/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@google-cloud/storage": "^7.18.0",
"@kubernetes/client-node": "^0.22.3",
"@pulumi/command": "1.1.0",
"@pulumi/gcp": "8.32.1",
"@pulumi/gcp": "^9.10.0",
"@pulumi/kubernetes": "4.23.0",
"@pulumi/pulumi": "3.202.0",
"@pulumi/random": "4.18.2",
Expand Down
3 changes: 1 addition & 2 deletions cluster/pulumi/infra/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
"@pulumi/auth0": "3.21.0",
"@pulumi/kubernetes-cert-manager": "0.2.0",
"@pulumiverse/grafana": "0.16.3",
"@lfdecentralizedtrust/splice-pulumi-common": "1.0.0",
"@pulumi/gcp": "8.32.1"
"@lfdecentralizedtrust/splice-pulumi-common": "1.0.0"
},
"overrides": {
"@pulumi/kubernetes-cert-manager": {
Expand Down
216 changes: 149 additions & 67 deletions cluster/pulumi/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cluster/pulumi/policies/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"@pulumi/kubernetes-cert-manager": "0.2.0",
"@pulumiverse/grafana": "0.16.3",
"@lfdecentralizedtrust/splice-pulumi-common": "1.0.0",
"@pulumi/gcp": "8.32.1",
"@pulumi/gcp": "^9.10.0",
"@pulumi/policy": "1.20.0"
},
"overrides": {
Expand Down
Loading