{"action":"created","comment":{"url":"https://api.github.com/repos/kubernetes/kubernetes/pulls/comments/72504072","id":72504072,"diff_hunk":"@@ -716,13 +720,23 @@ func (dm *DockerManager) runContainer(\n \n // setInfraContainerNetworkConfig sets the network configuration for the infra-container. We only set network configuration for infra-container, all\n // the user containers will share the same network namespace with infra-container.\n-func setInfraContainerNetworkConfig(pod *api.Pod, netMode string, opts *kubecontainer.RunContainerOptions, dockerOpts *dockertypes.ContainerCreateConfig) {\n+func (dm *DockerManager) setInfraContainerNetworkConfig(pod *api.Pod, netMode string, opts *kubecontainer.RunContainerOptions, dockerOpts *dockertypes.ContainerCreateConfig) {\n \texposedPorts, portBindings := makePortsAndBindings(opts.PortMappings)\n \tdockerOpts.Config.ExposedPorts = exposedPorts\n \tdockerOpts.HostConfig.PortBindings = dockernat.PortMap(portBindings)\n \n+\tresult, err := dm.checkDockerAPIVersion(dockerV112APIVersion)\n+\tif err != nil {\n+\t\tglog.Errorf(\"Failed to check docker api version: %v\", err)\n+\t}\n+\n+\thostNetPlusDNSEnabled := result >= 0\n+\n \tif netMode != namespaceModeHost {\n \t\tdockerOpts.Config.Hostname = opts.Hostname\n+\t}\n+\n+\tif netMode != namespaceModeHost || (netMode == namespaceModeHost && hostNetPlusDNSEnabled) {","path":"pkg/kubelet/dockertools/docker_manager.go","position":41,"original_position":41,"commit_id":"f3205789e6af222a505b06ab40c4a4c15c9f85ef","original_commit_id":"0f7850889dcfd2f3700b549f1881cd4f2cdd3d0f","user":{"login":"vefimova","id":11852061,"avatar_url":"https://avatars.githubusercontent.com/u/11852061?v=3","gravatar_id":"","url":"https://api.github.com/users/vefimova","html_url":"https://github.com/vefimova","followers_url":"https://api.github.com/users/vefimova/followers","following_url":"https://api.github.com/users/vefimova/following{/other_user}","gists_url":"https://api.github.com/users/vefimova/gists{/gist_id}","starred_url":"https://api.github.com/users/vefimova/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vefimova/subscriptions","organizations_url":"https://api.github.com/users/vefimova/orgs","repos_url":"https://api.github.com/users/vefimova/repos","events_url":"https://api.github.com/users/vefimova/events{/privacy}","received_events_url":"https://api.github.com/users/vefimova/received_events","type":"User","site_admin":false},"body":"> So, if I understand points 3 and 4 correctly, the DOCKER_OPTS were already there but this adds them via the Docker CLI/API ?\r\nYes, that's right (see https://github.com/docker/docker/issues/21976#issue-147926813).\r\n\r\n> To understand the urgency, is there something that is going to break in existing code after the 1.12 Docker release on 28th July ?\r\n\r\nThere were long discussions and numerious requests in both docker and k8s projects for adding the ability to set dns settings along with --net=host. And now it is going to be available in docker 1.12. But this desirable feature still wouldn't become available to k8s users without additional patch. So it's just about to have it in place asap. :)\r\n","created_at":"2016-07-27T19:13:02Z","updated_at":"2016-07-27T19:13:02Z","html_url":"https://github.com/kubernetes/kubernetes/pull/29378#discussion_r72504072","pull_request_url":"https://api.github.com/repos/kubernetes/kubernetes/pulls/29378","_links":{"self":{"href":"https://api.github.com/repos/kubernetes/kubernetes/pulls/comments/72504072"},"html":{"href":"https://github.com/kubernetes/kubernetes/pull/29378#discussion_r72504072"},"pull_request":{"href":"https://api.github.com/repos/kubernetes/kubernetes/pulls/29378"}}},"pull_request":{"url":"https://api.github.com/repos/kubernetes/kubernetes/pulls/29378","id":78323524,"html_url":"https://github.com/kubernetes/kubernetes/pull/29378","diff_url":"https://github.com/kubernetes/kubernetes/pull/29378.diff","patch_url":"https://github.com/kubernetes/kubernetes/pull/29378.patch","issue_url":"https://api.github.com/repos/kubernetes/kubernetes/issues/29378","number":29378,"state":"open","locked":false,"title":"Added support for options --dns and --net=host are not mutually exclusive in docker 1.12","user":{"login":"vefimova","id":11852061,"avatar_url":"https://avatars.githubusercontent.com/u/11852061?v=3","gravatar_id":"","url":"https://api.github.com/users/vefimova","html_url":"https://github.com/vefimova","followers_url":"https://api.github.com/users/vefimova/followers","following_url":"https://api.github.com/users/vefimova/following{/other_user}","gists_url":"https://api.github.com/users/vefimova/gists{/gist_id}","starred_url":"https://api.github.com/users/vefimova/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vefimova/subscriptions","organizations_url":"https://api.github.com/users/vefimova/orgs","repos_url":"https://api.github.com/users/vefimova/repos","events_url":"https://api.github.com/users/vefimova/events{/privacy}","received_events_url":"https://api.github.com/users/vefimova/received_events","type":"User","site_admin":false},"body":"Fixes #17406","created_at":"2016-07-21T14:16:10Z","updated_at":"2016-07-27T19:13:02Z","closed_at":null,"merged_at":null,"merge_commit_sha":"bb598c3b741f55f6433ac327aac2b4a13605d1dd","assignee":{"login":"Random-Liu","id":5821883,"avatar_url":"https://avatars.githubusercontent.com/u/5821883?v=3","gravatar_id":"","url":"https://api.github.com/users/Random-Liu","html_url":"https://github.com/Random-Liu","followers_url":"https://api.github.com/users/Random-Liu/followers","following_url":"https://api.github.com/users/Random-Liu/following{/other_user}","gists_url":"https://api.github.com/users/Random-Liu/gists{/gist_id}","starred_url":"https://api.github.com/users/Random-Liu/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Random-Liu/subscriptions","organizations_url":"https://api.github.com/users/Random-Liu/orgs","repos_url":"https://api.github.com/users/Random-Liu/repos","events_url":"https://api.github.com/users/Random-Liu/events{/privacy}","received_events_url":"https://api.github.com/users/Random-Liu/received_events","type":"User","site_admin":false},"assignees":[{"login":"Random-Liu","id":5821883,"avatar_url":"https://avatars.githubusercontent.com/u/5821883?v=3","gravatar_id":"","url":"https://api.github.com/users/Random-Liu","html_url":"https://github.com/Random-Liu","followers_url":"https://api.github.com/users/Random-Liu/followers","following_url":"https://api.github.com/users/Random-Liu/following{/other_user}","gists_url":"https://api.github.com/users/Random-Liu/gists{/gist_id}","starred_url":"https://api.github.com/users/Random-Liu/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Random-Liu/subscriptions","organizations_url":"https://api.github.com/users/Random-Liu/orgs","repos_url":"https://api.github.com/users/Random-Liu/repos","events_url":"https://api.github.com/users/Random-Liu/events{/privacy}","received_events_url":"https://api.github.com/users/Random-Liu/received_events","type":"User","site_admin":false},{"login":"girishkalele","id":18541549,"avatar_url":"https://avatars.githubusercontent.com/u/18541549?v=3","gravatar_id":"","url":"https://api.github.com/users/girishkalele","html_url":"https://github.com/girishkalele","followers_url":"https://api.github.com/users/girishkalele/followers","following_url":"https://api.github.com/users/girishkalele/following{/other_user}","gists_url":"https://api.github.com/users/girishkalele/gists{/gist_id}","starred_url":"https://api.github.com/users/girishkalele/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/girishkalele/subscriptions","organizations_url":"https://api.github.com/users/girishkalele/orgs","repos_url":"https://api.github.com/users/girishkalele/repos","events_url":"https://api.github.com/users/girishkalele/events{/privacy}","received_events_url":"https://api.github.com/users/girishkalele/received_events","type":"User","site_admin":false}],"milestone":null,"commits_url":"https://api.github.com/repos/kubernetes/kubernetes/pulls/29378/commits","review_comments_url":"https://api.github.com/repos/kubernetes/kubernetes/pulls/29378/comments","review_comment_url":"https://api.github.com/repos/kubernetes/kubernetes/pulls/comments{/number}","comments_url":"https://api.github.com/repos/kubernetes/kubernetes/issues/29378/comments","statuses_url":"https://api.github.com/repos/kubernetes/kubernetes/statuses/f3205789e6af222a505b06ab40c4a4c15c9f85ef","head":{"label":"vefimova:docker_resolv","ref":"docker_resolv","sha":"f3205789e6af222a505b06ab40c4a4c15c9f85ef","user":{"login":"vefimova","id":11852061,"avatar_url":"https://avatars.githubusercontent.com/u/11852061?v=3","gravatar_id":"","url":"https://api.github.com/users/vefimova","html_url":"https://github.com/vefimova","followers_url":"https://api.github.com/users/vefimova/followers","following_url":"https://api.github.com/users/vefimova/following{/other_user}","gists_url":"https://api.github.com/users/vefimova/gists{/gist_id}","starred_url":"https://api.github.com/users/vefimova/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vefimova/subscriptions","organizations_url":"https://api.github.com/users/vefimova/orgs","repos_url":"https://api.github.com/users/vefimova/repos","events_url":"https://api.github.com/users/vefimova/events{/privacy}","received_events_url":"https://api.github.com/users/vefimova/received_events","type":"User","site_admin":false},"repo":{"id":58924700,"name":"kubernetes","full_name":"vefimova/kubernetes","owner":{"login":"vefimova","id":11852061,"avatar_url":"https://avatars.githubusercontent.com/u/11852061?v=3","gravatar_id":"","url":"https://api.github.com/users/vefimova","html_url":"https://github.com/vefimova","followers_url":"https://api.github.com/users/vefimova/followers","following_url":"https://api.github.com/users/vefimova/following{/other_user}","gists_url":"https://api.github.com/users/vefimova/gists{/gist_id}","starred_url":"https://api.github.com/users/vefimova/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vefimova/subscriptions","organizations_url":"https://api.github.com/users/vefimova/orgs","repos_url":"https://api.github.com/users/vefimova/repos","events_url":"https://api.github.com/users/vefimova/events{/privacy}","received_events_url":"https://api.github.com/users/vefimova/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/vefimova/kubernetes","description":"Container Cluster Manager from Google","fork":true,"url":"https://api.github.com/repos/vefimova/kubernetes","forks_url":"https://api.github.com/repos/vefimova/kubernetes/forks","keys_url":"https://api.github.com/repos/vefimova/kubernetes/keys{/key_id}","collaborators_url":"https://api.github.com/repos/vefimova/kubernetes/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/vefimova/kubernetes/teams","hooks_url":"https://api.github.com/repos/vefimova/kubernetes/hooks","issue_events_url":"https://api.github.com/repos/vefimova/kubernetes/issues/events{/number}","events_url":"https://api.github.com/repos/vefimova/kubernetes/events","assignees_url":"https://api.github.com/repos/vefimova/kubernetes/assignees{/user}","branches_url":"https://api.github.com/repos/vefimova/kubernetes/branches{/branch}","tags_url":"https://api.github.com/repos/vefimova/kubernetes/tags","blobs_url":"https://api.github.com/repos/vefimova/kubernetes/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/vefimova/kubernetes/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/vefimova/kubernetes/git/refs{/sha}","trees_url":"https://api.github.com/repos/vefimova/kubernetes/git/trees{/sha}","statuses_url":"https://api.github.com/repos/vefimova/kubernetes/statuses/{sha}","languages_url":"https://api.github.com/repos/vefimova/kubernetes/languages","stargazers_url":"https://api.github.com/repos/vefimova/kubernetes/stargazers","contributors_url":"https://api.github.com/repos/vefimova/kubernetes/contributors","subscribers_url":"https://api.github.com/repos/vefimova/kubernetes/subscribers","subscription_url":"https://api.github.com/repos/vefimova/kubernetes/subscription","commits_url":"https://api.github.com/repos/vefimova/kubernetes/commits{/sha}","git_commits_url":"https://api.github.com/repos/vefimova/kubernetes/git/commits{/sha}","comments_url":"https://api.github.com/repos/vefimova/kubernetes/comments{/number}","issue_comment_url":"https://api.github.com/repos/vefimova/kubernetes/issues/comments{/number}","contents_url":"https://api.github.com/repos/vefimova/kubernetes/contents/{+path}","compare_url":"https://api.github.com/repos/vefimova/kubernetes/compare/{base}...{head}","merges_url":"https://api.github.com/repos/vefimova/kubernetes/merges","archive_url":"https://api.github.com/repos/vefimova/kubernetes/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/vefimova/kubernetes/downloads","issues_url":"https://api.github.com/repos/vefimova/kubernetes/issues{/number}","pulls_url":"https://api.github.com/repos/vefimova/kubernetes/pulls{/number}","milestones_url":"https://api.github.com/repos/vefimova/kubernetes/milestones{/number}","notifications_url":"https://api.github.com/repos/vefimova/kubernetes/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/vefimova/kubernetes/labels{/name}","releases_url":"https://api.github.com/repos/vefimova/kubernetes/releases{/id}","deployments_url":"https://api.github.com/repos/vefimova/kubernetes/deployments","created_at":"2016-05-16T10:39:24Z","updated_at":"2016-05-16T10:39:39Z","pushed_at":"2016-07-27T15:28:10Z","git_url":"git://github.com/vefimova/kubernetes.git","ssh_url":"git@github.com:vefimova/kubernetes.git","clone_url":"https://github.com/vefimova/kubernetes.git","svn_url":"https://github.com/vefimova/kubernetes","homepage":"http://kubernetes.io","size":300552,"stargazers_count":0,"watchers_count":0,"language":"Go","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"kubernetes:master","ref":"master","sha":"6fd685b54b4ebaf502a60331bbb6e334226da988","user":{"login":"kubernetes","id":13629408,"avatar_url":"https://avatars.githubusercontent.com/u/13629408?v=3","gravatar_id":"","url":"https://api.github.com/users/kubernetes","html_url":"https://github.com/kubernetes","followers_url":"https://api.github.com/users/kubernetes/followers","following_url":"https://api.github.com/users/kubernetes/following{/other_user}","gists_url":"https://api.github.com/users/kubernetes/gists{/gist_id}","starred_url":"https://api.github.com/users/kubernetes/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kubernetes/subscriptions","organizations_url":"https://api.github.com/users/kubernetes/orgs","repos_url":"https://api.github.com/users/kubernetes/repos","events_url":"https://api.github.com/users/kubernetes/events{/privacy}","received_events_url":"https://api.github.com/users/kubernetes/received_events","type":"Organization","site_admin":false},"repo":{"id":20580498,"name":"kubernetes","full_name":"kubernetes/kubernetes","owner":{"login":"kubernetes","id":13629408,"avatar_url":"https://avatars.githubusercontent.com/u/13629408?v=3","gravatar_id":"","url":"https://api.github.com/users/kubernetes","html_url":"https://github.com/kubernetes","followers_url":"https://api.github.com/users/kubernetes/followers","following_url":"https://api.github.com/users/kubernetes/following{/other_user}","gists_url":"https://api.github.com/users/kubernetes/gists{/gist_id}","starred_url":"https://api.github.com/users/kubernetes/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/kubernetes/subscriptions","organizations_url":"https://api.github.com/users/kubernetes/orgs","repos_url":"https://api.github.com/users/kubernetes/repos","events_url":"https://api.github.com/users/kubernetes/events{/privacy}","received_events_url":"https://api.github.com/users/kubernetes/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/kubernetes/kubernetes","description":"Production-Grade Container Scheduling and Management","fork":false,"url":"https://api.github.com/repos/kubernetes/kubernetes","forks_url":"https://api.github.com/repos/kubernetes/kubernetes/forks","keys_url":"https://api.github.com/repos/kubernetes/kubernetes/keys{/key_id}","collaborators_url":"https://api.github.com/repos/kubernetes/kubernetes/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/kubernetes/kubernetes/teams","hooks_url":"https://api.github.com/repos/kubernetes/kubernetes/hooks","issue_events_url":"https://api.github.com/repos/kubernetes/kubernetes/issues/events{/number}","events_url":"https://api.github.com/repos/kubernetes/kubernetes/events","assignees_url":"https://api.github.com/repos/kubernetes/kubernetes/assignees{/user}","branches_url":"https://api.github.com/repos/kubernetes/kubernetes/branches{/branch}","tags_url":"https://api.github.com/repos/kubernetes/kubernetes/tags","blobs_url":"https://api.github.com/repos/kubernetes/kubernetes/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/kubernetes/kubernetes/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/kubernetes/kubernetes/git/refs{/sha}","trees_url":"https://api.github.com/repos/kubernetes/kubernetes/git/trees{/sha}","statuses_url":"https://api.github.com/repos/kubernetes/kubernetes/statuses/{sha}","languages_url":"https://api.github.com/repos/kubernetes/kubernetes/languages","stargazers_url":"https://api.github.com/repos/kubernetes/kubernetes/stargazers","contributors_url":"https://api.github.com/repos/kubernetes/kubernetes/contributors","subscribers_url":"https://api.github.com/repos/kubernetes/kubernetes/subscribers","subscription_url":"https://api.github.com/repos/kubernetes/kubernetes/subscription","commits_url":"https://api.github.com/repos/kubernetes/kubernetes/commits{/sha}","git_commits_url":"https://api.github.com/repos/kubernetes/kubernetes/git/commits{/sha}","comments_url":"https://api.github.com/repos/kubernetes/kubernetes/comments{/number}","issue_comment_url":"https://api.github.com/repos/kubernetes/kubernetes/issues/comments{/number}","contents_url":"https://api.github.com/repos/kubernetes/kubernetes/contents/{+path}","compare_url":"https://api.github.com/repos/kubernetes/kubernetes/compare/{base}...{head}","merges_url":"https://api.github.com/repos/kubernetes/kubernetes/merges","archive_url":"https://api.github.com/repos/kubernetes/kubernetes/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/kubernetes/kubernetes/downloads","issues_url":"https://api.github.com/repos/kubernetes/kubernetes/issues{/number}","pulls_url":"https://api.github.com/repos/kubernetes/kubernetes/pulls{/number}","milestones_url":"https://api.github.com/repos/kubernetes/kubernetes/milestones{/number}","notifications_url":"https://api.github.com/repos/kubernetes/kubernetes/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/kubernetes/kubernetes/labels{/name}","releases_url":"https://api.github.com/repos/kubernetes/kubernetes/releases{/id}","deployments_url":"https://api.github.com/repos/kubernetes/kubernetes/deployments","created_at":"2014-06-06T22:56:04Z","updated_at":"2016-07-27T18:52:46Z","pushed_at":"2016-07-27T19:07:06Z","git_url":"git://github.com/kubernetes/kubernetes.git","ssh_url":"git@github.com:kubernetes/kubernetes.git","clone_url":"https://github.com/kubernetes/kubernetes.git","svn_url":"https://github.com/kubernetes/kubernetes","homepage":"http://kubernetes.io","size":513534,"stargazers_count":15799,"watchers_count":15799,"language":"Go","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":4991,"mirror_url":null,"open_issues_count":4051,"forks":4991,"open_issues":4051,"watchers":15799,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/kubernetes/kubernetes/pulls/29378"},"html":{"href":"https://github.com/kubernetes/kubernetes/pull/29378"},"issue":{"href":"https://api.github.com/repos/kubernetes/kubernetes/issues/29378"},"comments":{"href":"https://api.github.com/repos/kubernetes/kubernetes/issues/29378/comments"},"review_comments":{"href":"https://api.github.com/repos/kubernetes/kubernetes/pulls/29378/comments"},"review_comment":{"href":"https://api.github.com/repos/kubernetes/kubernetes/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/kubernetes/kubernetes/pulls/29378/commits"},"statuses":{"href":"https://api.github.com/repos/kubernetes/kubernetes/statuses/f3205789e6af222a505b06ab40c4a4c15c9f85ef"}}}}
{"actor":{"display_login":"vefimova"}}