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

feature: dns configuration for cri manager #912

Merged
merged 1 commit into from
Mar 20, 2018

Conversation

YaoZengzeng
Copy link
Contributor

Signed-off-by: YaoZengzeng yaozengzeng@zju.edu.cn

Ⅰ. Describe what this PR did

Ⅱ. Does this pull request fix one issue?

fixes part of #635

Ⅲ. Describe how you did it

First, we create a file /var/lib/pouch/sandbox/${sandbox id}/resolv.conf for every sandbox.

If the pod has configured the DNS configuration, then we write it to the file created above, else we copy the content of /etc/resolv.conf in host to it.

Finally we mount the file to every container's /etc/resolv.conf, then every container in the same pod will have the same DNS configuration :)

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@pouchrobot
Copy link
Collaborator

ping @YaoZengzeng

CI fails according integration system.
Please refer to the CI failure Details button to corresponding test, and update your PR to pass CI.

If this is flaky test, welcome to track this with profiling an issue.

build url: https://travis-ci.org/alibaba/pouch/builds/354230101
build duration: 1045s

Signed-off-by: YaoZengzeng <yaozengzeng@zju.edu.cn>
@codecov-io
Copy link

Codecov Report

Merging #912 into master will decrease coverage by 0.1%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #912      +/-   ##
==========================================
- Coverage   13.66%   13.56%   -0.11%     
==========================================
  Files         121      121              
  Lines        7667     7725      +58     
==========================================
  Hits         1048     1048              
- Misses       6529     6587      +58     
  Partials       90       90
Impacted Files Coverage Δ
daemon/mgr/cri.go 0% <0%> (ø) ⬆️
daemon/mgr/cri_utils.go 30.56% <0%> (-3.56%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fa50191...62773a6. Read the comment docs.

@YaoZengzeng
Copy link
Contributor Author

@allencloud PTAL.

@allencloud
Copy link
Collaborator

LGTM

@allencloud allencloud merged commit cb9b22e into AliyunContainerService:master Mar 20, 2018
@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Mar 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature LGTM one maintainer or community participant agrees to merge the pull reuqest. size/L
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants