Skip to content

Commit

Permalink
Correct subnet IP range for rsp/demo
Browse files Browse the repository at this point in the history
  • Loading branch information
athornton committed Apr 13, 2024
1 parent bfc7035 commit e2c9dcb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
11 changes: 7 additions & 4 deletions NEW_ENVIRONMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,16 @@ I'm creating a `demo` environment from `dev`, so:
that was created when you applied the first PR.
* Finally, pick new subnets that are not yet in use. You're going to
need two. They start at `10.128.0.0/23`, and the next unused
one is (at the time of writing) `10.136.0.0/23`. The first one
one is (at the time of writing) `10.168.0.0/23`. It is necessary to
search all the environments, not just the type you're creating, to
determine what is first unused (that is, all the projects, qserv,
roundtable, whatever, each have their own subnets). The first one
becomes the `subnet_ip` key for the first subnet. The
`secondary_ranges` subnet should increase the second octet by one (so,
for instance, if you picked `10.136.0.0/23` the `kubernetes-pods`
should get `10.137.0.0/23`. The `kubernetes-services` range should
for instance, if you picked `10.168.0.0/23` the `kubernetes-pods`
should get `10.169.0.0/23`. The `kubernetes-services` range should
use the *first* subnet range, but the third octet should be `16` and
the width should be `20`: in this example, `10.136.16.0/20`.
the width should be `20`: in this example, `10.168.16.0/20`.

## Additional tfvars files

Expand Down
6 changes: 3 additions & 3 deletions environment/deployments/science-platform/env/demo.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ budget_alert_spent_percents = [0.7, 0.8, 0.9, 1.0]
network_name = "science-platform-demo-vpc"
subnets = [
{
"subnet_ip" = "10.134.0.0/23",
"subnet_ip" = "10.166.0.0/23",
"subnet_name" = "subnet-us-central1-01",
"subnet_region" = "us-central1",
"subnet_private_access" = "true"
Expand All @@ -19,11 +19,11 @@ secondary_ranges = {
"subnet-us-central1-01" : [
{
range_name = "kubernetes-pods"
ip_cidr_range = "10.135.0.0/16"
ip_cidr_range = "10.167.0.0/16"
},
{
range_name = "kubernetes-services"
ip_cidr_range = "10.134.16.0/20"
ip_cidr_range = "10.166.16.0/20"
},
]
}
Expand Down

0 comments on commit e2c9dcb

Please sign in to comment.