Skip to content
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.

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

AWS kube-up: Allow VPC CIDR to be specified (experimental) #23362

Merged
merged 1 commit into from
May 11, 2016

Conversation

miguelfrde
Copy link
Contributor

@miguelfrde miguelfrde commented Mar 22, 2016

Hey @justinsb regarding the question I asked on Slack that @gy8 pointed me to a previous conversation between you and him. Here's a simple fix to allow to configure the base VPC CIDR.


This change is Reviewable

@k8s-bot
Copy link

k8s-bot commented Mar 22, 2016

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

This message may repeat a few times in short succession due to jenkinsci/ghprb-plugin#292. Sorry.

Otherwise, if this message is too spammy, please complain to ixdy.

2 similar comments
@k8s-bot
Copy link

k8s-bot commented Mar 22, 2016

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

This message may repeat a few times in short succession due to jenkinsci/ghprb-plugin#292. Sorry.

Otherwise, if this message is too spammy, please complain to ixdy.

@k8s-bot
Copy link

k8s-bot commented Mar 22, 2016

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

This message may repeat a few times in short succession due to jenkinsci/ghprb-plugin#292. Sorry.

Otherwise, if this message is too spammy, please complain to ixdy.

@k8s-github-robot k8s-github-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Mar 22, 2016
@eparis
Copy link
Contributor

eparis commented Mar 23, 2016

ok to test

@eparis
Copy link
Contributor

eparis commented Mar 23, 2016

I'm going to re-assign to justin. It is 'fine' in my eyes. I don't like the whole base/cidr implementation and don't love exposing that to a user. Then again, I don't use the AWS stuff, so I'm not going to force 3 env vars that suit my tastes.

@dengshuan
Copy link

I think it's better to just expose VPC_CIDR and SUBNET_CIDR as environment variable here instead of VPC_CIDR_BASE. Because what if someone else want to change vpc cidr suffix, do we need to add another variable VPC_CIDR_SUFFIX and let users configure it.
So I'd suggest to change these lines to

MASTER_IP_SUFFIX=.9   # Currently I'm not sure if this is important and configurable
VPC_CIDR=${VPC_CIDR:-172.20.0.0/16}
SUBNET_CIDR=${SUBNET_CIDR:-172.20.0.0/24}

@ajohnstone
Copy link
Contributor

Agree with @dengshuan so that the cidr range can be adjusted. Would be nice to get this released as currently sed'ing the files.

@ajohnstone
Copy link
Contributor

After looking at this closer, it should ideally aid in configuring the following... otherwise a number of other issues will occur. At least it should be added to the documentation.

export NON_MASQUERADE_CIDR="172.16.0.0/14"
export SERVICE_CLUSTER_IP_RANGE="172.16.0.0/16"
export DNS_SERVER_IP="172.16.0.10"
export MASTER_IP_RANGE="172.17.0.0/24"
export CLUSTER_IP_RANGE="172.18.0.0/16"

@justinsb justinsb changed the title AWS: Allow to configure the base VPC CIDR AWS: Allow the VPC base CIDR to be specified (experimental) May 10, 2016
@justinsb justinsb added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels May 10, 2016
@justinsb
Copy link
Member

I think this is the right place to start; we'll consider it experimental for the moment, but people do need this.

@justinsb justinsb added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 10, 2016
@justinsb justinsb changed the title AWS: Allow the VPC base CIDR to be specified (experimental) AWS kube-up: Allow VPC CIDR to be specified (experimental) May 10, 2016
@k8s-bot
Copy link

k8s-bot commented May 10, 2016

GCE e2e build/test passed for commit 485aa7f.

@fabioy fabioy merged commit 4dcc4bb into kubernetes:master May 11, 2016
openshift-publish-robot pushed a commit to openshift/kubernetes that referenced this pull request Jul 15, 2019
…alidation

Fix APIServer CRD admission

Origin-commit: 11f423a763517b36760a158144c7ee033c4a0956
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants