Skip to content

Commit 00b1938

Browse files
authored
Break peering to observability vpcs (#219)
1 parent 9784e16 commit 00b1938

3 files changed

Lines changed: 6 additions & 42 deletions

File tree

pulumi/config.dev.yaml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,12 @@ resources:
3535
enable_dns_hostnames: True
3636
enable_nat_gateway: True
3737
egress_via_nat_gateway: True
38-
peering_connections:
39-
fluentbit-dev:
40-
peered_cidrs:
41-
- 10.202.0.0/22
42-
peer_vpc_id: vpc-09d12278743f0da97
43-
auto_accept: True # Requires both VPCs to be in same account and region
44-
# Allow resolution of DNS records to private IPs (so we can use a private LB)
45-
accepter:
46-
allow_remote_vpc_dns_resolution: True
47-
requester:
48-
allow_remote_vpc_dns_resolution: True
38+
peering_connections: {}
4939
# If you want to supply specific EIPs to this, you can do that here:
5040
# nat_gateway_allocation_id:
5141
# nat_gateway_secondary_allocation_ids:
5242
additional_routes:
53-
private:
54-
- destination_cidr_block: 10.202.0.0/22 # observability-dev
55-
vpc_peering_connection_id: pcx-04d7e54008cd9326c
43+
private: []
5644
public: []
5745
endpoint_interfaces:
5846
- secretsmanager

pulumi/config.prod.yaml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,11 @@ resources:
4141
- eipalloc-0055539e4d56176f1 # 5.60.96.11
4242
endpoint_interfaces:
4343
- secretsmanager
44-
peering_connections:
45-
fluentbit-prod:
46-
peered_cidrs:
47-
- 10.200.0.0/22
48-
peer_vpc_id: vpc-028ee60c9e7f6b28e
49-
auto_accept: True # Requires both VPCs to be in same account and region
50-
# Allow resolution of DNS records to private IPs (so we can use a private LB)
51-
accepter:
52-
allow_remote_vpc_dns_resolution: True
53-
requester:
54-
allow_remote_vpc_dns_resolution: True
44+
peering_connections: {}
5545
additional_routes:
5646
private:
5747
- destination_cidr_block: 10.10.0.0/16 # accounts-prod
5848
vpc_peering_connection_id: pcx-0fdcc9b776a069d2d
59-
- destination_cidr_block: 10.200.0.0/22 # fluentbit-prod
60-
vpc_peering_connection_id: pcx-0d581e66566a6e00b
6149
public: []
6250

6351
# Dynamic values set in code, or not at all:
@@ -69,7 +57,7 @@ resources:
6957
bastion:
7058
ssh_keypair_name: mailstrom-prod
7159
source_cidrs:
72-
- 38.15.46.29/32
60+
- 10.0.0.0/16
7361
# Fill out this template to build an SSH bastion
7462
# tb:ec2:SshableInstance:
7563
# bastion:

pulumi/config.stage.yaml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,30 +39,18 @@ resources:
3939
- eipalloc-0f512d7cb3929b176 # 63.179.185.6
4040
endpoint_interfaces:
4141
- secretsmanager
42-
peering_connections:
43-
fluentbit-stage:
44-
peered_cidrs:
45-
- 10.201.0.0/22
46-
peer_vpc_id: vpc-0c83219ee10024f16
47-
auto_accept: True # Requires both VPCs to be in same account and region
48-
# Allow resolution of DNS records to private IPs (so we can use a private LB)
49-
accepter:
50-
allow_remote_vpc_dns_resolution: True
51-
requester:
52-
allow_remote_vpc_dns_resolution: True
42+
peering_connections: {}
5343
additional_routes:
5444
private:
5545
- destination_cidr_block: 10.11.0.0/16 # accounts-stage
5646
vpc_peering_connection_id: pcx-063f07eca0677a761
57-
- destination_cidr_block: 10.201.0.0/22 # fluentbit-stage
58-
vpc_peering_connection_id: pcx-03dd1daa0b700ab37
5947
public: []
6048

6149
tb:ec2:SshableInstance:
6250
bastion:
6351
ssh_keypair_name: mailstrom-stage
6452
source_cidrs:
65-
- 10.2.0.0/16
53+
- 10.1.0.0/16
6654
ami: ami-082478ca34e882109
6755

6856
# Fill out this template to build an SSH bastion

0 commit comments

Comments
 (0)