github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
k3s/pkg/kubelet/dockershim
History
Kubernetes Submit Queue 6c6f4f0185 Merge pull request #43925 from Random-Liu/fix-dockershim-dns-options 
Automatic merge from submit-queue

[CRI] Use DNSOptions passed by CRI in dockershim.

When @xlgao-zju is working on the CRI validation test, he found that dockershim is not using the DNSOptions passed in CRI. https://github.com/kubernetes-incubator/cri-tools/pull/30#issuecomment-290644357

This PR fixed the issue. I've manually tried, for `ClusterFirst` DNSPolicy, the resolv.conf will be:
```
nameserver 8.8.8.8
search corp.google.com prod.google.com prodz.google.com google.com
options ndots:5
```

For `Default` DNSPolicy, the resolv.conf will be:
```
nameserver 127.0.1.1
search corp.google.com prod.google.com prodz.google.com google.com
```

@xlgao-zju You should be able to test after this PR is merged.

/cc @yujuhong @feiskyer
 		2017-04-03 11:58:23 -07:00
..
cm start the apimachinery repo 2017-01-11 09:09:48 -05:00
errors update bazel 2017-02-15 10:06:49 -08:00
remote kubelet/dockershim: update cri to protobuf v3 2017-01-20 09:55:37 +08:00
testing update bazel 2017-02-15 10:06:49 -08:00
BUILD Run hack/update-bazel.sh 2017-03-20 17:48:36 +08:00
checkpoint_store.go dockershim: call sync() after writing the checkpoint 2017-03-14 18:36:51 -07:00
checkpoint_store_test.go initialize directory while creating checkpoint file store 2017-02-17 16:56:46 -08:00
convert.go Generate valid container id in fake docker client. 2017-03-01 10:33:08 -08:00
convert_test.go Fix package aliases to follow golang convention 2016-11-30 15:40:50 +08:00
doc.go cmd/kubelet 2016-11-23 15:53:09 -08:00
docker_checkpoint.go initialize directory while creating checkpoint file store 2017-02-17 16:56:46 -08:00
docker_checkpoint_test.go Add checkpointHandler to DockerService 2017-02-02 10:19:34 -08:00
docker_container.go Only create the symlink when container log path exists 2017-03-08 01:36:48 -05:00
docker_container_test.go FakeDockerClient: add creation timestamp 2017-03-08 17:11:16 -08:00
docker_image.go kubelet/dockershim: update cri to protobuf v3 2017-01-20 09:55:37 +08:00
docker_image_test.go Various fixes for the fake docker client 2017-03-07 10:11:49 -08:00
docker_legacy.go Add legacy container cleanup 2017-02-02 15:36:24 -08:00
docker_legacy_test.go Add unit test for legacy container cleanup 2017-02-02 15:36:24 -08:00
docker_sandbox.go Use DNSOptions passed by CRI in dockershim. 2017-04-03 10:24:42 -07:00
docker_sandbox_test.go Merge pull request #42739 from yujuhong/created_time 2017-03-09 02:51:38 -08:00
docker_service.go Merge pull request #43057 from feiskyer/docker-version 2017-03-26 21:34:04 -07:00
docker_service_test.go dockershim: use network PluginManager to synchronize pod network operations 2017-02-16 13:51:19 -06:00
docker_streaming.go CRI Portforward needs to forward websocket ports 2017-02-01 18:03:42 -07:00
helpers.go dockershim: process protocol correctly for port mapping 2017-03-20 16:52:24 +08:00
helpers_test.go Add unit test for MakePortsAndBindings 2017-03-20 17:47:38 +08:00
naming.go Add legacy container cleanup 2017-02-02 15:36:24 -08:00
naming_test.go Add unit test for the work around. 2017-01-25 14:15:41 -08:00
security_context.go make func modifySandboxNamespaceOptions() more robust 2017-03-31 14:14:10 +08:00
security_context_test.go dockershim: set security option separators based on the docker version 2017-02-07 11:06:40 -08:00