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

Making DHCP_OPTION_SET_ID creation optional #27278

Merged
merged 1 commit into from
Jun 28, 2016

Conversation

j1n6
Copy link
Contributor

@j1n6 j1n6 commented Jun 13, 2016

Reason: We have a pre-configured VPC in AWS. kube-up.sh should not making changes to the VPC DHCP option if there's already DHCP options configured.

PR Changes: When DHCP_OPTION_SET_ID is given in environment variable, kube-up.sh will skip the DHCP_OPTION_SET_ID creation.

@k8s-bot
Copy link

k8s-bot commented Jun 13, 2016

Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test".
(Note: "add to whitelist" is no longer supported. Please update configurations in kubernetes/test-infra/jenkins/job-configs/kubernetes-jenkins-pull instead.)

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 Jun 13, 2016

Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test".
(Note: "add to whitelist" is no longer supported. Please update configurations in kubernetes/test-infra/jenkins/job-configs/kubernetes-jenkins-pull instead.)

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 Jun 13, 2016

Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test".
(Note: "add to whitelist" is no longer supported. Please update configurations in kubernetes/test-infra/jenkins/job-configs/kubernetes-jenkins-pull instead.)

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 size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Jun 13, 2016
@roberthbailey
Copy link
Contributor

ok to test

@roberthbailey
Copy link
Contributor

/cc @justinsb

@j1n6
Copy link
Contributor Author

j1n6 commented Jun 14, 2016

Any one can review this sooner?

@roberthbailey
Copy link
Contributor

@activars sorry for the delay. This wasn't tagged with 1.3 so it wasn't at the top of my review list. This LGTM, but it won't be merged by the submit queue until the master branch is opened to non-1.3 changes.

@roberthbailey roberthbailey added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 14, 2016
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 14, 2016
@roberthbailey roberthbailey added release-note Denotes a PR that will be considered when it comes time to generate release notes. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed release-note-label-needed labels Jun 14, 2016
@roberthbailey
Copy link
Contributor

ok to test

@j1n6
Copy link
Contributor Author

j1n6 commented Jun 15, 2016

@roberthbailey Thanks. pls let me know if there are anything I need to do.

@roberthbailey
Copy link
Contributor

Nope. This PR is just waiting for the master branch to exit the slush period around the 1.3 release and start accepting new PRs.

@k8s-bot
Copy link

k8s-bot commented Jun 19, 2016

GCE e2e build/test passed for commit 70ac7ab.

@k8s-bot
Copy link

k8s-bot commented Jun 23, 2016

Can one of the admins verify that this patch is reasonable to test? If so, please reply "ok to test".
(Note: "add to whitelist" is no longer supported. Please update configurations in kubernetes/test-infra/jenkins/job-configs/kubernetes-jenkins-pull instead.)

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.

@roberthbailey
Copy link
Contributor

ok to test

@k8s-bot
Copy link

k8s-bot commented Jun 27, 2016

GCE e2e build/test passed for commit 70ac7ab.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Jun 28, 2016

GCE e2e build/test passed for commit 70ac7ab.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit c0e0e74 into kubernetes:master Jun 28, 2016
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.

5 participants