-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
10 changed files
with
175 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
59 changes: 45 additions & 14 deletions
59
examples/full-setup-tf-upgrade/variables.subnets.auto.tfvars
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,19 +1,50 @@ | ||
| public_subnets = [ | ||
| ## { base_cidr = "10.188.64.0/24", label = "public", bits = 2, private = false, enabled=false, tags = {} }, | ||
| ] | ||
| public_subnets = [] | ||
| # /19 layout | ||
| private_subnets = [ | ||
| { base_cidr = "10.188.65.0/24", label = "endpoints", bits = 2, private = true, enabled = true, tags = {} }, | ||
| { base_cidr = "10.188.65.192/26", label = "attachment", bits = 2, private = true, enabled = true, tags = { "boc:vpc:route-table" = "attachment" } }, | ||
| { base_cidr = "10.188.66.0/23", label = "private-lb", bits = 2, private = true, enabled = true, | ||
| { base_cidr = "10.{X}.{y}.0/24", label = "endpoints", bits = 2, private = true, enabled = true, tags = {} }, | ||
| { base_cidr = "10.{X}.{y}.192/26", label = "attachment", bits = 2, private = true, enabled = true, tags = { "boc:vpc:route-table" = "attachment" } }, | ||
| { base_cidr = "10.{X}.{y+1}.0/24", label = "(free)", bits = 2, private = true, enabled = false, tags = {} }, | ||
| { base_cidr = "10.{X}.{y+2}.0/23", label = "private-lb", bits = 2, private = true, enabled = true, | ||
| tags = { "kubernetes.io/role/internal-elb" = 1 } | ||
| }, | ||
| { base_cidr = "10.188.68.0/23", label = "db", bits = 2, private = true, enabled = true, tags = {} }, | ||
| # { base_cidr = "10.188.70.0/23", label = "(free)", bits = 2, private = true, enabled=false, tags = {} }, | ||
| { base_cidr = "10.188.72.0/22", label = "apps", bits = 2, private = true, enabled = true, tags = {} }, | ||
| # { base_cidr = "10.188.76.0/22", label = "(free)", bits = 2, private = true, enabled=false, tags = {} }, | ||
| { base_cidr = "10.188.80.0/21", label = "container", bits = 2, private = true, enabled = true, | ||
| tags = { | ||
| # "kubernetes.io/cluster/dice-ite" = "shared" | ||
| }, | ||
| { base_cidr = "10.{X}.{y+4}.0/23", label = "db", bits = 2, private = true, enabled = true, tags = {} }, | ||
| { base_cidr = "10.{X}.{y+6}.0/23", label = "(free)", bits = 2, private = true, enabled = false, tags = {} }, | ||
| { base_cidr = "10.{X}.{y+8}.0/21", label = "apps", bits = 2, private = true, enabled = true, tags = {} }, | ||
| { base_cidr = "10.{X}.{y+16}.0/20", label = "container", bits = 2, private = true, enabled = true, | ||
| tags = {}, | ||
| } | ||
| ] | ||
|
|
||
| # layout for /19 | ||
| # endpoints 10.x.y.0/24 | ||
| # attachment 10.x.y.192/26 | ||
| # (free) 10.x.y+1.0/24 enabled=false | ||
| # private-lb 10.x.y+2.0/23 | ||
| # db 10.x.y+4.0/23 | ||
| # (free) 10.x.y+6.0/23 enabled=false | ||
| # apps 10.x.y+8.0/21 | ||
| # container 10.x.y+16.0/20 | ||
|
|
||
| # layout for /20 | ||
| # endpoints 10.x.y.0/24 | ||
| # attachment 10.x.y.192/26 | ||
| # db 10.x.y+1.0/24 | ||
| # private-lb 10.x.y+2.0/24 | ||
| # (free) 10.x.y+3.0/23 enabled=false | ||
| # apps 10.x.y+4.0/22 | ||
| # container 10.x.y+8.0/21 | ||
|
|
||
| ## # /20 layout | ||
| ## private_subnets = [ | ||
| ## { base_cidr = "10.{X}.{y}.0/24", label = "endpoints", bits = 2, private = true, enabled = true, tags = {} }, | ||
| ## { base_cidr = "10.{X}.{y}.192/26", label = "attachment", bits = 2, private = true, enabled = true, tags = { "boc:vpc:route-table" = "attachment" } }, | ||
| ## { base_cidr = "10.{X}.{y+1}.0/24", label = "db", bits = 2, private = true, enabled = true, tags = {} }, | ||
| ## { base_cidr = "10.{X}.{y+2}.0/24", label = "private-lb", bits = 2, private = true, enabled = true, | ||
| ## tags = { "kubernetes.io/role/internal-elb" = 1 } | ||
| ## }, | ||
| ## { base_cidr = "10.{X}.{y+3}.0/24", label = "(free)", bits = 2, private = true, enabled=false, tags = {} }, | ||
| ## { base_cidr = "10.{X}.{y+4}.0/22", label = "apps", bits = 2, private = true, enabled = true, tags = {} }, | ||
| ## { base_cidr = "10.{X}.{y+8}.0/21", label = "container", bits = 2, private = true, enabled = true, | ||
| ## tags = { }, | ||
| ## } | ||
| ## ] |
19 changes: 19 additions & 0 deletions
19
examples/full-setup-tf-upgrade/variables.subnets.auto.tfvars.old
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| public_subnets = [ | ||
| ## { base_cidr = "10.188.64.0/24", label = "public", bits = 2, private = false, enabled=false, tags = {} }, | ||
| ] | ||
| private_subnets = [ | ||
| { base_cidr = "10.188.65.0/24", label = "endpoints", bits = 2, private = true, enabled = true, tags = {} }, | ||
| { base_cidr = "10.188.65.192/26", label = "attachment", bits = 2, private = true, enabled = true, tags = { "boc:vpc:route-table" = "attachment" } }, | ||
| { base_cidr = "10.188.66.0/23", label = "private-lb", bits = 2, private = true, enabled = true, | ||
| tags = { "kubernetes.io/role/internal-elb" = 1 } | ||
| }, | ||
| { base_cidr = "10.188.68.0/23", label = "db", bits = 2, private = true, enabled = true, tags = {} }, | ||
| # { base_cidr = "10.188.70.0/23", label = "(free)", bits = 2, private = true, enabled=false, tags = {} }, | ||
| { base_cidr = "10.188.72.0/22", label = "apps", bits = 2, private = true, enabled = true, tags = {} }, | ||
| # { base_cidr = "10.188.76.0/22", label = "(free)", bits = 2, private = true, enabled=false, tags = {} }, | ||
| { base_cidr = "10.188.80.0/21", label = "container", bits = 2, private = true, enabled = true, | ||
| tags = { | ||
| # "kubernetes.io/cluster/dice-ite" = "shared" | ||
| }, | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,39 @@ | ||
| vpc_name = "dice-ite" | ||
| vpc_cidr_block = "10.188.64.0/19" | ||
| vpc_index = "4" | ||
| vpc_short_name = "vpc4" | ||
| vpc_full_name = "vpc4-dice-ite" | ||
| vpc_environment = "ite" | ||
| vpc_domain_name = "ite.dice.census.gov" | ||
| vpc_name = "{org}-{env}" | ||
| vpc_cidr_block = "{cidr}" | ||
| vpc_index = "{N}" | ||
| vpc_short_name = "vpc{N}" | ||
| vpc_full_name = "vpc{N}-{org}-{env}" | ||
| vpc_environment = "{env}" | ||
| vpc_domain_name = "{env}.{org}.csp1.census.gov" | ||
| vpc_dns_servers = ["148.129.127.22", "148.129.191.22"] | ||
| vpc_ntp_servers = ["148.129.127.23", "148.129.191.23"] | ||
| vpc_enable_igw = false | ||
| vpc_enable_nat = false | ||
| vpc_enable_vpn = true | ||
| vpc_enable_vpn_routing = true | ||
| vpc_enable_vpn = false | ||
| vpc_enable_vpn_routing = false | ||
| vpc_enable_awsdns = true | ||
| availability_zones = [] | ||
|
|
||
| tgw_enable_vpn_routing = false | ||
| tgw_enable_vpn_routing = true | ||
| tgw_environment = null | ||
| shared_vpc_label = "" | ||
|
|
||
| vpn_settings = [ | ||
| { site = "hq", "bgp_asn_id" = 65510, "ip_address" = "148.129.163.NNN" }, | ||
| { site = "bcc", "bgp_asn_id" = 65511, "ip_address" = "148.129.78.NNN" }, | ||
| ] | ||
| vpn_settings = [] | ||
| services_peer_settings = {} | ||
|
|
||
| #services_peer_settings = {} | ||
| services_peer_settings = { | ||
| "west" = { peer_name = "vpc1-services", region = "us-gov-west-1", rule_number = 2210 } | ||
| "east" = { peer_name = "vpc1-services", region = "us-gov-east-1", rule_number = 2260 } | ||
| } | ||
|
|
||
| # replace the placeholders | ||
| # {org} | ||
| # {cidr} = 10.x.y.0/mask (mask 19,20,21) | ||
| # {env} = services | common | shared | dev | test | ite | uat | qa | stage | prod | ||
| # {N} = sequence, 1 .. | ||
| # {tgw_env} = services | dev | test | stage | prod | cre | ||
| # required fields to update | ||
| # vpc_name | ||
| # vpc_cidr_block | ||
| # vpc_index | ||
| # vpc_short_name | ||
| # vpc_full_name | ||
| # vpc_environment | ||
| # vpc_omain_name | ||
| # tgw_environment |
31 changes: 31 additions & 0 deletions
31
examples/full-setup-tf-upgrade/variables.vpc.auto.tfvars.old
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| vpc_name = "dice-ite" | ||
| vpc_cidr_block = "10.188.64.0/19" | ||
| vpc_index = "4" | ||
| vpc_short_name = "vpc4" | ||
| vpc_full_name = "vpc4-dice-ite" | ||
| vpc_environment = "ite" | ||
| vpc_domain_name = "ite.dice.census.gov" | ||
| vpc_dns_servers = ["148.129.127.22", "148.129.191.22"] | ||
| vpc_ntp_servers = ["148.129.127.23", "148.129.191.23"] | ||
| vpc_enable_igw = false | ||
| vpc_enable_nat = false | ||
| vpc_enable_vpn = true | ||
| vpc_enable_vpn_routing = true | ||
| vpc_enable_awsdns = true | ||
| availability_zones = [] | ||
|
|
||
| tgw_enable_vpn_routing = false | ||
| tgw_environment = null | ||
| shared_vpc_label = "" | ||
|
|
||
| vpn_settings = [ | ||
| { site = "hq", "bgp_asn_id" = 65510, "ip_address" = "148.129.163.NNN" }, | ||
| { site = "bcc", "bgp_asn_id" = 65511, "ip_address" = "148.129.78.NNN" }, | ||
| ] | ||
|
|
||
| #services_peer_settings = {} | ||
| services_peer_settings = { | ||
| "west" = { peer_name = "vpc1-services", region = "us-gov-west-1", rule_number = 2210 } | ||
| "east" = { peer_name = "vpc1-services", region = "us-gov-east-1", rule_number = 2260 } | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters