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.

Sign up for GitHub

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

Jump to bottom

Add configurable dnsmasq params to KubeDNS #4919

Merged
merged 1 commit into from
Apr 9, 2018
Merged

Add configurable dnsmasq params to KubeDNS #4919

merged 1 commit into from
Apr 9, 2018

Conversation

jamesmcminn96
Copy link
Contributor

This PR lets kops manage two dnsmasq parameters that people may wish to change for tuning their kubedns setup

@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 5, 2018
@jamesmcminn96
Copy link
Contributor Author

/assign @andrewsykim

@jamesmcminn96
Copy link
Contributor Author

I've signed the CLA

andrewsykim
andrewsykim reviewed Apr 5, 2018
View reviewed changes
nodeup/pkg/model/docker.go Outdated
// into docker with the new overlay storage. Restart is on the background because
// kops-configuration is of type 'one-shot' so the restart command will wait for
// nodeup to finish executing
{"systemctl", "restart", "kops-configuration.service", "&"},
Copy link
Member

Choose a reason for hiding this comment

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

can you rebase so this change is removed

@andrewsykim
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 5, 2018
@jamesmcminn96 jamesmcminn96 force-pushed the feature/dnsmasq-extra-config-options branch from a12dd5d to 458f59d Compare April 5, 2018 23:13
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Apr 5, 2018
@jamesmcminn96
Copy link
Contributor Author

@andrewsykim i've rebased

@jamesmcminn96
Copy link
Contributor Author

/test pull-kops-bazel-test

@jamesmcminn96
Copy link
Contributor Author

@andrewsykim are we able to get this pushed through?

@justinsb
Copy link
Member

justinsb commented Apr 9, 2018

/lgtm

Thanks @jamesmcminn96 !

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 9, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jamesmcminn96, justinsb

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 9, 2018
@k8s-ci-robot k8s-ci-robot merged commit 5d2e730 into kubernetes:master Apr 9, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrewsykim andrewsykim andrewsykim left review comments

Assignees

@justinsb justinsb

@andrewsykim andrewsykim

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jamesmcminn96 @k8s-ci-robot @andrewsykim @justinsb