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

Add a default ingress ip range #10500

Merged
merged 1 commit into from
Aug 19, 2016

Conversation

marun
Copy link
Contributor

@marun marun commented Aug 18, 2016

If no ingress ip range is specified, default to a private range.
Ingress ip allocation can be disabled by specifying "0.0.0.0/32" for the range.

Addresses #10387

cc: @smarterclayton

@marun
Copy link
Contributor Author

marun commented Aug 18, 2016

Is this correct? I couldn't see how the 'cloud-provider' argument will be populated in config.KubeMasterConfig, so I'm not sure how the check in MasterArgs.BuildSerializeableMasterConfig() will ever fail.

@marun marun force-pushed the default-ingress-cidr branch from 97a6ede to 07be0a9 Compare August 18, 2016 08:29
@marun
Copy link
Contributor Author

marun commented Aug 18, 2016

[test]

// that will be allocated from. For security reasons, you should
// ensure that this range does not overlap with the CIDRs reserved
// for external ips, nodes, pods, or services.
IngressIPNetworkCIDR string
Copy link
Contributor

Choose a reason for hiding this comment

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

You don't need to add this here - we stopped allowing all but "critical" new flags here. Just adding it to the config is sufficient

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My intent was to allow an admin to set 0.0.0.0/32 to avoid having the default be set. From what I can tell, if IngressIPNetworkCIDR can't be set by arg, BuildSerializeableMasterConfig will always set the default ingress cidr (unless it conflicts with arg-provided service and cluster net). Am I missing something, or is that what you intend?

Copy link
Contributor

Choose a reason for hiding this comment

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

@marun marun force-pushed the default-ingress-cidr branch 3 times, most recently from a7a3f9c to 79df588 Compare August 19, 2016 12:42
If no ingress ip range is specified, default to a private range.
Ingress ip allocation can be disabled by specifying "0.0.0.0/32"
for the range.
@marun marun force-pushed the default-ingress-cidr branch from 79df588 to ee401cc Compare August 19, 2016 17:49
@openshift-bot
Copy link
Contributor

Evaluated for origin test up to ee401cc

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/8263/)

@marun marun added this to the 1.3.0 milestone Aug 19, 2016
@smarterclayton
Copy link
Contributor

LGTM [merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Aug 19, 2016

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/8263/) (Image: devenv-rhel7_4883)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to ee401cc

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants