Skip to content

Commit

Permalink
Allow to configure the base VPC CIDR
Browse files Browse the repository at this point in the history
  • Loading branch information
miguelfrde committed Mar 22, 2016
1 parent 1f8773e commit 485aa7f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
9 changes: 9 additions & 0 deletions cluster/aws/options.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,4 +141,13 @@ export MASTER_IP_RANGE="100.65.0.0/24"
export CLUSTER_IP_RANGE="100.66.0.0/16"
```

**KUBE_VPC_CIDR_BASE**

By default `kube-up.sh` will create a VPC with CIDR 172.20.0.0/16. `KUBE_VPC_CIDR_BASE` allows to configure
this CIDR. For example you may choose to use `172.21.0.0/16`:

```
export KUBE_VPC_CIDR_BASE=172.21
```

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/cluster/aws/options.md?pixel)]()
2 changes: 1 addition & 1 deletion cluster/aws/util.sh
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export AWS_DEFAULT_OUTPUT=text
AWS_CMD="aws ec2"
AWS_ASG_CMD="aws autoscaling"

VPC_CIDR_BASE=172.20
VPC_CIDR_BASE=${KUBE_VPC_CIDR_BASE:-172.20}
MASTER_IP_SUFFIX=.9
VPC_CIDR=${VPC_CIDR_BASE}.0.0/16
SUBNET_CIDR=${VPC_CIDR_BASE}.0.0/24
Expand Down

1 comment on commit 485aa7f

@k8s-teamcity-mesosphere

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TeamCity OSS :: Kubernetes Mesos :: 4 - Smoke Tests Build 19749 outcome was SUCCESS
Summary: Tests passed: 1, ignored: 265 Build time: 00:10:10

Please sign in to comment.