{"action":"created","comment":{"url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/pulls/comments/30186970","id":30186970,"diff_hunk":"@@ -1521,6 +1545,12 @@ func (kl *Kubelet) tryUpdateNodeStatus() error {\n \t\treturn fmt.Errorf(\"no node instance returned for %q\", kl.hostname)\n \t}\n \n+\tif kl.configureCBR0 {","path":"pkg/kubelet/kubelet.go","position":67,"original_position":67,"commit_id":"21f661c2d73da24e65179f5fabd87780be91b89f","original_commit_id":"21f661c2d73da24e65179f5fabd87780be91b89f","user":{"login":"dchen1107","id":7740897,"avatar_url":"https://avatars.githubusercontent.com/u/7740897?v=3","gravatar_id":"","url":"https://api.github.com/users/dchen1107","html_url":"https://github.com/dchen1107","followers_url":"https://api.github.com/users/dchen1107/followers","following_url":"https://api.github.com/users/dchen1107/following{/other_user}","gists_url":"https://api.github.com/users/dchen1107/gists{/gist_id}","starred_url":"https://api.github.com/users/dchen1107/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dchen1107/subscriptions","organizations_url":"https://api.github.com/users/dchen1107/orgs","repos_url":"https://api.github.com/users/dchen1107/repos","events_url":"https://api.github.com/users/dchen1107/events{/privacy}","received_events_url":"https://api.github.com/users/dchen1107/received_events","type":"User","site_admin":false},"body":"What is it going to happen if configureCBR0 is false? In this PR, you removed the old way to configure cbr0 through configure-vm.sh, but only configure it through kubelet if the flag is true. Shouldn't configure-vm.sh need to check the same flag / env variable?","created_at":"2015-05-12T22:20:57Z","updated_at":"2015-05-12T22:20:57Z","html_url":"https://github.com/GoogleCloudPlatform/kubernetes/pull/7984#discussion_r30186970","pull_request_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/pulls/7984","_links":{"self":{"href":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/pulls/comments/30186970"},"html":{"href":"https://github.com/GoogleCloudPlatform/kubernetes/pull/7984#discussion_r30186970"},"pull_request":{"href":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/pulls/7984"}}},"pull_request":{"url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/pulls/7984","id":35037869,"html_url":"https://github.com/GoogleCloudPlatform/kubernetes/pull/7984","diff_url":"https://github.com/GoogleCloudPlatform/kubernetes/pull/7984.diff","patch_url":"https://github.com/GoogleCloudPlatform/kubernetes/pull/7984.patch","issue_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/issues/7984","number":7984,"state":"open","locked":false,"title":"WIP: Kubelet configure cbr0 instead of configure-vm.sh","user":{"login":"cjcullen","id":7154008,"avatar_url":"https://avatars.githubusercontent.com/u/7154008?v=3","gravatar_id":"","url":"https://api.github.com/users/cjcullen","html_url":"https://github.com/cjcullen","followers_url":"https://api.github.com/users/cjcullen/followers","following_url":"https://api.github.com/users/cjcullen/following{/other_user}","gists_url":"https://api.github.com/users/cjcullen/gists{/gist_id}","starred_url":"https://api.github.com/users/cjcullen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cjcullen/subscriptions","organizations_url":"https://api.github.com/users/cjcullen/orgs","repos_url":"https://api.github.com/users/cjcullen/repos","events_url":"https://api.github.com/users/cjcullen/events{/privacy}","received_events_url":"https://api.github.com/users/cjcullen/received_events","type":"User","site_admin":false},"body":"We need this to get #6949 to work, now that the master assigns CIDRs to nodes.\r\n\r\nCurrently, we have:\r\n\r\nKubelet:\r\n1. Configure-vm.sh spins until node-ip-range entry can be read from metadata.\r\n2. Salt creates cbr0 w/ node-ip-range.\r\n3. Kubelet starts up, asks for itself from apiserver.\r\n\r\nNodeController:\r\n1. Query GCE instances to get list of (new) nodes.\r\n2. For each node:\r\n  * Choose an unused CIDR for that node.\r\n  * Add node to registry\r\n  * Create a route for that CIDR to the node.\r\n  * Set the node-ip-range value in that node's metadata to the CIDR.\r\n\r\nIf we want kubelet to reach out to the master to register (#6949), we have a bootstrapping problem:\r\n* NodeController is not relying on cloudProvider for a list of nodes, so starts with no known nodes.\r\n* Kubelet never starts because configure-vm.sh is waiting for NodeController to write node-ip-range to metadata.\r\n\r\nWhat this PR would do is:\r\n\r\nKubelet:\r\n1. Salt creates cbr0 w/ some garbage CIDR range.\r\n2. Kubelet starts up, asks for itself from apiserver.\r\n3. If the NodeSpec has a PodCIDR set that does not match the existing cbr0, reconfigure cbr0 and restart docker.\r\n\r\nNodeController:\r\n1. Query GCE instances to get list of (new) nodes.\r\n2. For each node:\r\n  * Choose an unused CIDR for that node.\r\n  * Add node to registry\r\n  * Create a route for that CIDR to the node.\r\n\r\nThis will allow #6949 to look like:\r\n\r\nKubelet:\r\n1. Salt creates cbr0 w/ some garbage CIDR range.\r\n2. Kubelet starts up, posts registration to apiserver.\r\n3. Kubelet asks for itself from apiserver.\r\n4. If the NodeSpec has a PodCIDR set that does not match the existing cbr0, reconfigure cbr0 and restart docker.\r\n\r\nNodeController:\r\n1. When a node posts its registration:\r\n  * Choose an unused CIDR for that node.\r\n  * Add node to registry\r\n  * Create a route for that CIDR to the node.\r\n","created_at":"2015-05-08T19:12:59Z","updated_at":"2015-05-12T22:20:57Z","closed_at":null,"merged_at":null,"merge_commit_sha":"f36be457a15f4bc14a357144db788754cb59bea1","assignee":{"login":"dchen1107","id":7740897,"avatar_url":"https://avatars.githubusercontent.com/u/7740897?v=3","gravatar_id":"","url":"https://api.github.com/users/dchen1107","html_url":"https://github.com/dchen1107","followers_url":"https://api.github.com/users/dchen1107/followers","following_url":"https://api.github.com/users/dchen1107/following{/other_user}","gists_url":"https://api.github.com/users/dchen1107/gists{/gist_id}","starred_url":"https://api.github.com/users/dchen1107/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/dchen1107/subscriptions","organizations_url":"https://api.github.com/users/dchen1107/orgs","repos_url":"https://api.github.com/users/dchen1107/repos","events_url":"https://api.github.com/users/dchen1107/events{/privacy}","received_events_url":"https://api.github.com/users/dchen1107/received_events","type":"User","site_admin":false},"milestone":null,"commits_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/pulls/7984/commits","review_comments_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/pulls/7984/comments","review_comment_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/pulls/comments{/number}","comments_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/issues/7984/comments","statuses_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/statuses/21f661c2d73da24e65179f5fabd87780be91b89f","head":{"label":"cjcullen:kubelet","ref":"kubelet","sha":"21f661c2d73da24e65179f5fabd87780be91b89f","user":{"login":"cjcullen","id":7154008,"avatar_url":"https://avatars.githubusercontent.com/u/7154008?v=3","gravatar_id":"","url":"https://api.github.com/users/cjcullen","html_url":"https://github.com/cjcullen","followers_url":"https://api.github.com/users/cjcullen/followers","following_url":"https://api.github.com/users/cjcullen/following{/other_user}","gists_url":"https://api.github.com/users/cjcullen/gists{/gist_id}","starred_url":"https://api.github.com/users/cjcullen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cjcullen/subscriptions","organizations_url":"https://api.github.com/users/cjcullen/orgs","repos_url":"https://api.github.com/users/cjcullen/repos","events_url":"https://api.github.com/users/cjcullen/events{/privacy}","received_events_url":"https://api.github.com/users/cjcullen/received_events","type":"User","site_admin":false},"repo":{"id":22969428,"name":"kubernetes","full_name":"cjcullen/kubernetes","owner":{"login":"cjcullen","id":7154008,"avatar_url":"https://avatars.githubusercontent.com/u/7154008?v=3","gravatar_id":"","url":"https://api.github.com/users/cjcullen","html_url":"https://github.com/cjcullen","followers_url":"https://api.github.com/users/cjcullen/followers","following_url":"https://api.github.com/users/cjcullen/following{/other_user}","gists_url":"https://api.github.com/users/cjcullen/gists{/gist_id}","starred_url":"https://api.github.com/users/cjcullen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/cjcullen/subscriptions","organizations_url":"https://api.github.com/users/cjcullen/orgs","repos_url":"https://api.github.com/users/cjcullen/repos","events_url":"https://api.github.com/users/cjcullen/events{/privacy}","received_events_url":"https://api.github.com/users/cjcullen/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/cjcullen/kubernetes","description":"Container Cluster Manager","fork":true,"url":"https://api.github.com/repos/cjcullen/kubernetes","forks_url":"https://api.github.com/repos/cjcullen/kubernetes/forks","keys_url":"https://api.github.com/repos/cjcullen/kubernetes/keys{/key_id}","collaborators_url":"https://api.github.com/repos/cjcullen/kubernetes/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/cjcullen/kubernetes/teams","hooks_url":"https://api.github.com/repos/cjcullen/kubernetes/hooks","issue_events_url":"https://api.github.com/repos/cjcullen/kubernetes/issues/events{/number}","events_url":"https://api.github.com/repos/cjcullen/kubernetes/events","assignees_url":"https://api.github.com/repos/cjcullen/kubernetes/assignees{/user}","branches_url":"https://api.github.com/repos/cjcullen/kubernetes/branches{/branch}","tags_url":"https://api.github.com/repos/cjcullen/kubernetes/tags","blobs_url":"https://api.github.com/repos/cjcullen/kubernetes/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/cjcullen/kubernetes/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/cjcullen/kubernetes/git/refs{/sha}","trees_url":"https://api.github.com/repos/cjcullen/kubernetes/git/trees{/sha}","statuses_url":"https://api.github.com/repos/cjcullen/kubernetes/statuses/{sha}","languages_url":"https://api.github.com/repos/cjcullen/kubernetes/languages","stargazers_url":"https://api.github.com/repos/cjcullen/kubernetes/stargazers","contributors_url":"https://api.github.com/repos/cjcullen/kubernetes/contributors","subscribers_url":"https://api.github.com/repos/cjcullen/kubernetes/subscribers","subscription_url":"https://api.github.com/repos/cjcullen/kubernetes/subscription","commits_url":"https://api.github.com/repos/cjcullen/kubernetes/commits{/sha}","git_commits_url":"https://api.github.com/repos/cjcullen/kubernetes/git/commits{/sha}","comments_url":"https://api.github.com/repos/cjcullen/kubernetes/comments{/number}","issue_comment_url":"https://api.github.com/repos/cjcullen/kubernetes/issues/comments{/number}","contents_url":"https://api.github.com/repos/cjcullen/kubernetes/contents/{+path}","compare_url":"https://api.github.com/repos/cjcullen/kubernetes/compare/{base}...{head}","merges_url":"https://api.github.com/repos/cjcullen/kubernetes/merges","archive_url":"https://api.github.com/repos/cjcullen/kubernetes/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/cjcullen/kubernetes/downloads","issues_url":"https://api.github.com/repos/cjcullen/kubernetes/issues{/number}","pulls_url":"https://api.github.com/repos/cjcullen/kubernetes/pulls{/number}","milestones_url":"https://api.github.com/repos/cjcullen/kubernetes/milestones{/number}","notifications_url":"https://api.github.com/repos/cjcullen/kubernetes/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/cjcullen/kubernetes/labels{/name}","releases_url":"https://api.github.com/repos/cjcullen/kubernetes/releases{/id}","created_at":"2014-08-14T21:36:31Z","updated_at":"2015-02-23T06:10:33Z","pushed_at":"2015-05-11T21:32:21Z","git_url":"git://github.com/cjcullen/kubernetes.git","ssh_url":"git@github.com:cjcullen/kubernetes.git","clone_url":"https://github.com/cjcullen/kubernetes.git","svn_url":"https://github.com/cjcullen/kubernetes","homepage":null,"size":52096,"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":"GoogleCloudPlatform:master","ref":"master","sha":"be15e84e83f12300c48081860d36624d1695fb02","user":{"login":"GoogleCloudPlatform","id":2810941,"avatar_url":"https://avatars.githubusercontent.com/u/2810941?v=3","gravatar_id":"","url":"https://api.github.com/users/GoogleCloudPlatform","html_url":"https://github.com/GoogleCloudPlatform","followers_url":"https://api.github.com/users/GoogleCloudPlatform/followers","following_url":"https://api.github.com/users/GoogleCloudPlatform/following{/other_user}","gists_url":"https://api.github.com/users/GoogleCloudPlatform/gists{/gist_id}","starred_url":"https://api.github.com/users/GoogleCloudPlatform/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/GoogleCloudPlatform/subscriptions","organizations_url":"https://api.github.com/users/GoogleCloudPlatform/orgs","repos_url":"https://api.github.com/users/GoogleCloudPlatform/repos","events_url":"https://api.github.com/users/GoogleCloudPlatform/events{/privacy}","received_events_url":"https://api.github.com/users/GoogleCloudPlatform/received_events","type":"Organization","site_admin":false},"repo":{"id":20580498,"name":"kubernetes","full_name":"GoogleCloudPlatform/kubernetes","owner":{"login":"GoogleCloudPlatform","id":2810941,"avatar_url":"https://avatars.githubusercontent.com/u/2810941?v=3","gravatar_id":"","url":"https://api.github.com/users/GoogleCloudPlatform","html_url":"https://github.com/GoogleCloudPlatform","followers_url":"https://api.github.com/users/GoogleCloudPlatform/followers","following_url":"https://api.github.com/users/GoogleCloudPlatform/following{/other_user}","gists_url":"https://api.github.com/users/GoogleCloudPlatform/gists{/gist_id}","starred_url":"https://api.github.com/users/GoogleCloudPlatform/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/GoogleCloudPlatform/subscriptions","organizations_url":"https://api.github.com/users/GoogleCloudPlatform/orgs","repos_url":"https://api.github.com/users/GoogleCloudPlatform/repos","events_url":"https://api.github.com/users/GoogleCloudPlatform/events{/privacy}","received_events_url":"https://api.github.com/users/GoogleCloudPlatform/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/GoogleCloudPlatform/kubernetes","description":"Container Cluster Manager from Google","fork":false,"url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes","forks_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/forks","keys_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/keys{/key_id}","collaborators_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/teams","hooks_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/hooks","issue_events_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/issues/events{/number}","events_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/events","assignees_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/assignees{/user}","branches_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/branches{/branch}","tags_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/tags","blobs_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/git/refs{/sha}","trees_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/git/trees{/sha}","statuses_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/statuses/{sha}","languages_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/languages","stargazers_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/stargazers","contributors_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/contributors","subscribers_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/subscribers","subscription_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/subscription","commits_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/commits{/sha}","git_commits_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/git/commits{/sha}","comments_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/comments{/number}","issue_comment_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/issues/comments{/number}","contents_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/contents/{+path}","compare_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/compare/{base}...{head}","merges_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/merges","archive_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/downloads","issues_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/issues{/number}","pulls_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/pulls{/number}","milestones_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/milestones{/number}","notifications_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/labels{/name}","releases_url":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/releases{/id}","created_at":"2014-06-06T22:56:04Z","updated_at":"2015-05-12T22:01:24Z","pushed_at":"2015-05-12T22:12:12Z","git_url":"git://github.com/GoogleCloudPlatform/kubernetes.git","ssh_url":"git@github.com:GoogleCloudPlatform/kubernetes.git","clone_url":"https://github.com/GoogleCloudPlatform/kubernetes.git","svn_url":"https://github.com/GoogleCloudPlatform/kubernetes","homepage":"http://kubernetes.io","size":261643,"stargazers_count":7607,"watchers_count":7607,"language":"Go","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":1554,"mirror_url":null,"open_issues_count":1049,"forks":1554,"open_issues":1049,"watchers":7607,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/pulls/7984"},"html":{"href":"https://github.com/GoogleCloudPlatform/kubernetes/pull/7984"},"issue":{"href":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/issues/7984"},"comments":{"href":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/issues/7984/comments"},"review_comments":{"href":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/pulls/7984/comments"},"review_comment":{"href":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/pulls/7984/commits"},"statuses":{"href":"https://api.github.com/repos/GoogleCloudPlatform/kubernetes/statuses/21f661c2d73da24e65179f5fabd87780be91b89f"}}}}