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 support for --dns flag in Docker config #12789

Merged
merged 1 commit into from
Nov 24, 2021
Merged

Add support for --dns flag in Docker config #12789

merged 1 commit into from
Nov 24, 2021

Conversation

jwolski2
Copy link
Contributor

This commit adds support for the --dns flag which is provided as a
Docker daemon startup flag. The flag is used to set the IP address of
the DNS server that the daemon injects into containers. Multiple --dns
flags are supported.

Closes #12755

This commit adds support for the --dns flag which is provided as a
Docker daemon startup flag. The flag is used to set the IP address of
the DNS server that the daemon injects into containers. Multiple --dns
flags are supported.
@linux-foundation-easycla
Copy link

linux-foundation-easycla bot commented Nov 19, 2021

CLA Signed

The committers are authorized under a signed CLA.

@k8s-ci-robot
Copy link
Contributor

Welcome @jwolski2!

It looks like this is your first PR to kubernetes/kops 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kops has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 19, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @jwolski2. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 19, 2021
@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 the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Nov 19, 2021
@hakman
Copy link
Member

hakman commented Nov 20, 2021

Hey @jwolski2. The PR looks good, but I see EasyCLA is no reporting green. I think @olemarkus had a similar issue?
Maybe this helps too: kubernetes/org#3068.
/ok-to-test
/check-cla

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Nov 20, 2021
@jwolski2
Copy link
Contributor Author

Hey @hakman Thanks for the initial look. I'll double-check with my CLA Manager that all was authorized.

@sftim
Copy link

sftim commented Nov 20, 2021

EasyCLA is in preview; @jwolski2 you do have a CLA signoff.

@jwolski2
Copy link
Contributor Author

@hakman @sftim Okie dokie. It looks like I'm all authorized now, through EasyCLA etc!

@jwolski2
Copy link
Contributor Author

@hakman What is the process by which we'd get this fix backported to Kops 1.19? Is that documented somewhere?

@hakman
Copy link
Member

hakman commented Nov 22, 2021

@jwolski2 There is no process to back-port to kOps 1.19. There is no plan to release any other builds there.
I can cherry-pick this to 1.22 and 1.21 but it may take a while for those patch versions to be released.

@jwolski2
Copy link
Contributor Author

Just a poke to clarify whether this PR is waiting on me... @hakman @olemarkus Do you have it from here?

Copy link
Member

@hakman hakman left a comment

Choose a reason for hiding this comment

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

Thanks @jwolski2! :)

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

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 lgtm "Looks good to me", indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 24, 2021
@k8s-ci-robot k8s-ci-robot merged commit a8289da into kubernetes:master Nov 24, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Nov 24, 2021
k8s-ci-robot added a commit that referenced this pull request Nov 27, 2021
…-upstream-release-1.21

Automated cherry pick of #12789: Add support for --dns flag in Docker config
k8s-ci-robot added a commit that referenced this pull request Nov 27, 2021
…-upstream-release-1.22

Automated cherry pick of #12789: Add support for --dns flag in Docker config
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api area/nodeup 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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.

Add --dns to DOCKER_OPTS
4 participants