Skip to content

Deduplicate gcp network #1200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
moritzkiefer-da wants to merge 1 commit into from
Closed

Deduplicate gcp network #1200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 10 additions & 0 deletions cluster/pulumi/common/src/gcpNetwork.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import * as gcp from '@pulumi/gcp';
import * as pulumi from '@pulumi/pulumi';

const project = gcp.organizations.getProjectOutput({});

// use existing default network (needs to have a private vpc connection)
export const privateNetwork = gcp.compute.Network.get(
'default',
pulumi.interpolate`projects/${project.name}/global/networks/default`
);
1 change: 1 addition & 0 deletions cluster/pulumi/common/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@ export * from './serviceAccount';
export * from './participantKms';
export * from './config/migrationSchema';
export * from './pruning';
export * from './gcpNetwork';
9 changes: 1 addition & 8 deletions cluster/pulumi/common/src/postgres.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Resource } from '@pulumi/pulumi';
import { CnChartVersion } from './artifacts';
import { clusterSmallDisk, config } from './config';
import { spliceConfig } from './config/config';
import { privateNetwork } from './gcpNetwork';
import { installSpliceHelmChart } from './helm';
import { installPostgresPasswordSecret } from './secrets';
import { ChartValues, CLUSTER_BASENAME, ExactNamespace, GCP_ZONE } from './utils';
Expand All @@ -16,14 +17,6 @@ const protectCloudSql = spliceConfig.pulumiProjectConfig.cloudSql.protected;
const cloudSqlDbInstance = spliceConfig.pulumiProjectConfig.cloudSql.tier;
const cloudSqlEnterprisePlus = spliceConfig.pulumiProjectConfig.cloudSql.enterprisePlus;

const project = gcp.organizations.getProjectOutput({});

// use existing default network (needs to have a private vpc connection)
const privateNetwork = gcp.compute.Network.get(
'default',
pulumi.interpolate`projects/${project.name}/global/networks/default`
);

function generatePassword(name: string, opts?: pulumi.ResourceOptions): random.RandomPassword {
return new random.RandomPassword(
name,
Expand Down
8 changes: 1 addition & 7 deletions cluster/pulumi/infra/src/network.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
GCP_PROJECT,
getDnsNames,
isDevNet,
privateNetwork,
} from 'splice-pulumi-common';
import { infraAffinityAndTolerations } from 'splice-pulumi-common';

Expand Down Expand Up @@ -232,18 +233,11 @@ function clusterCertificate(
);
}

const project = gcp.config.project;

function natGateway(
clusterName: string,
egressIp: gcp.compute.Address,
options = {}
): gcp.compute.RouterNat {
const privateNetwork = gcp.compute.Network.get(
'default',
`projects/${project}/global/networks/default`
);

const subnet = gcp.compute.getSubnetworkOutput({
name: `cn-${clusterName}net-subnet`,
});
Expand Down
Loading