{"action":"closed","number":4444,"pull_request":{"url":"https://api.github.com/repos/deis/deis/pulls/4444","id":44709794,"html_url":"https://github.com/deis/deis/pull/4444","diff_url":"https://github.com/deis/deis/pull/4444.diff","patch_url":"https://github.com/deis/deis/pull/4444.patch","issue_url":"https://api.github.com/repos/deis/deis/issues/4444","number":4444,"state":"closed","locked":false,"title":"ref(user-data): use default etcd2 and flannel services","user":{"login":"mboersma","id":73019,"avatar_url":"https://avatars.githubusercontent.com/u/73019?v=3","gravatar_id":"","url":"https://api.github.com/users/mboersma","html_url":"https://github.com/mboersma","followers_url":"https://api.github.com/users/mboersma/followers","following_url":"https://api.github.com/users/mboersma/following{/other_user}","gists_url":"https://api.github.com/users/mboersma/gists{/gist_id}","starred_url":"https://api.github.com/users/mboersma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mboersma/subscriptions","organizations_url":"https://api.github.com/users/mboersma/orgs","repos_url":"https://api.github.com/users/mboersma/repos","events_url":"https://api.github.com/users/mboersma/events{/privacy}","received_events_url":"https://api.github.com/users/mboersma/received_events","type":"User","site_admin":false},"body":"This refactors and hopefully simplifies the thorny cloud-config Deis has in user-data.example. It uses the native CoreOS flanneld.service and etcd2.service--currently v2.1.2, same as Deis v1.10--and minimizes the differences with a [stock CoreOS user-data](https://github.com/coreos/coreos-vagrant/blob/master/user-data.sample). Also removes `etcd` timing tweaks which seemed to be unneeded based on my testing for v1.10--see #4384.\r\n\r\nAlso moves Docker `--insecure-registry` config into a unit drop-in and removes the cruft from the graceful-shutdown script. I've tested this against vagrant with Deis v1.10, Deis master, and Deis v1.8 upgraded to v1.10 + this PR. Also tested k8s, v1.9.1 upgrade, and the graceful-shutdown.sh script.\r\n\r\nCloses #4384.\r\nCloses #4409.","created_at":"2015-09-10T19:37:14Z","updated_at":"2015-09-15T16:18:55Z","closed_at":"2015-09-15T16:18:55Z","merged_at":"2015-09-15T16:18:55Z","merge_commit_sha":"805ea437de80c839c77ec0c8f80cd5780b8e3932","assignee":{"login":"mboersma","id":73019,"avatar_url":"https://avatars.githubusercontent.com/u/73019?v=3","gravatar_id":"","url":"https://api.github.com/users/mboersma","html_url":"https://github.com/mboersma","followers_url":"https://api.github.com/users/mboersma/followers","following_url":"https://api.github.com/users/mboersma/following{/other_user}","gists_url":"https://api.github.com/users/mboersma/gists{/gist_id}","starred_url":"https://api.github.com/users/mboersma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mboersma/subscriptions","organizations_url":"https://api.github.com/users/mboersma/orgs","repos_url":"https://api.github.com/users/mboersma/repos","events_url":"https://api.github.com/users/mboersma/events{/privacy}","received_events_url":"https://api.github.com/users/mboersma/received_events","type":"User","site_admin":false},"milestone":{"url":"https://api.github.com/repos/deis/deis/milestones/44","html_url":"https://github.com/deis/deis/milestones/v1.11","labels_url":"https://api.github.com/repos/deis/deis/milestones/44/labels","id":1208071,"number":44,"title":"v1.11","description":"","creator":{"login":"mboersma","id":73019,"avatar_url":"https://avatars.githubusercontent.com/u/73019?v=3","gravatar_id":"","url":"https://api.github.com/users/mboersma","html_url":"https://github.com/mboersma","followers_url":"https://api.github.com/users/mboersma/followers","following_url":"https://api.github.com/users/mboersma/following{/other_user}","gists_url":"https://api.github.com/users/mboersma/gists{/gist_id}","starred_url":"https://api.github.com/users/mboersma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mboersma/subscriptions","organizations_url":"https://api.github.com/users/mboersma/orgs","repos_url":"https://api.github.com/users/mboersma/repos","events_url":"https://api.github.com/users/mboersma/events{/privacy}","received_events_url":"https://api.github.com/users/mboersma/received_events","type":"User","site_admin":false},"open_issues":20,"closed_issues":23,"state":"open","created_at":"2015-07-14T20:31:22Z","updated_at":"2015-09-15T16:18:55Z","due_on":"2015-10-06T06:00:00Z","closed_at":null},"commits_url":"https://api.github.com/repos/deis/deis/pulls/4444/commits","review_comments_url":"https://api.github.com/repos/deis/deis/pulls/4444/comments","review_comment_url":"https://api.github.com/repos/deis/deis/pulls/comments{/number}","comments_url":"https://api.github.com/repos/deis/deis/issues/4444/comments","statuses_url":"https://api.github.com/repos/deis/deis/statuses/445dbaecfadb1e2690734413cc43f30abcb13b21","head":{"label":"mboersma:use-coreos-etcd2","ref":"use-coreos-etcd2","sha":"445dbaecfadb1e2690734413cc43f30abcb13b21","user":{"login":"mboersma","id":73019,"avatar_url":"https://avatars.githubusercontent.com/u/73019?v=3","gravatar_id":"","url":"https://api.github.com/users/mboersma","html_url":"https://github.com/mboersma","followers_url":"https://api.github.com/users/mboersma/followers","following_url":"https://api.github.com/users/mboersma/following{/other_user}","gists_url":"https://api.github.com/users/mboersma/gists{/gist_id}","starred_url":"https://api.github.com/users/mboersma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mboersma/subscriptions","organizations_url":"https://api.github.com/users/mboersma/orgs","repos_url":"https://api.github.com/users/mboersma/repos","events_url":"https://api.github.com/users/mboersma/events{/privacy}","received_events_url":"https://api.github.com/users/mboersma/received_events","type":"User","site_admin":false},"repo":{"id":22923232,"name":"deis","full_name":"mboersma/deis","owner":{"login":"mboersma","id":73019,"avatar_url":"https://avatars.githubusercontent.com/u/73019?v=3","gravatar_id":"","url":"https://api.github.com/users/mboersma","html_url":"https://github.com/mboersma","followers_url":"https://api.github.com/users/mboersma/followers","following_url":"https://api.github.com/users/mboersma/following{/other_user}","gists_url":"https://api.github.com/users/mboersma/gists{/gist_id}","starred_url":"https://api.github.com/users/mboersma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mboersma/subscriptions","organizations_url":"https://api.github.com/users/mboersma/orgs","repos_url":"https://api.github.com/users/mboersma/repos","events_url":"https://api.github.com/users/mboersma/events{/privacy}","received_events_url":"https://api.github.com/users/mboersma/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/mboersma/deis","description":"Your PaaS. Your Rules. ","fork":true,"url":"https://api.github.com/repos/mboersma/deis","forks_url":"https://api.github.com/repos/mboersma/deis/forks","keys_url":"https://api.github.com/repos/mboersma/deis/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mboersma/deis/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mboersma/deis/teams","hooks_url":"https://api.github.com/repos/mboersma/deis/hooks","issue_events_url":"https://api.github.com/repos/mboersma/deis/issues/events{/number}","events_url":"https://api.github.com/repos/mboersma/deis/events","assignees_url":"https://api.github.com/repos/mboersma/deis/assignees{/user}","branches_url":"https://api.github.com/repos/mboersma/deis/branches{/branch}","tags_url":"https://api.github.com/repos/mboersma/deis/tags","blobs_url":"https://api.github.com/repos/mboersma/deis/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mboersma/deis/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mboersma/deis/git/refs{/sha}","trees_url":"https://api.github.com/repos/mboersma/deis/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mboersma/deis/statuses/{sha}","languages_url":"https://api.github.com/repos/mboersma/deis/languages","stargazers_url":"https://api.github.com/repos/mboersma/deis/stargazers","contributors_url":"https://api.github.com/repos/mboersma/deis/contributors","subscribers_url":"https://api.github.com/repos/mboersma/deis/subscribers","subscription_url":"https://api.github.com/repos/mboersma/deis/subscription","commits_url":"https://api.github.com/repos/mboersma/deis/commits{/sha}","git_commits_url":"https://api.github.com/repos/mboersma/deis/git/commits{/sha}","comments_url":"https://api.github.com/repos/mboersma/deis/comments{/number}","issue_comment_url":"https://api.github.com/repos/mboersma/deis/issues/comments{/number}","contents_url":"https://api.github.com/repos/mboersma/deis/contents/{+path}","compare_url":"https://api.github.com/repos/mboersma/deis/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mboersma/deis/merges","archive_url":"https://api.github.com/repos/mboersma/deis/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mboersma/deis/downloads","issues_url":"https://api.github.com/repos/mboersma/deis/issues{/number}","pulls_url":"https://api.github.com/repos/mboersma/deis/pulls{/number}","milestones_url":"https://api.github.com/repos/mboersma/deis/milestones{/number}","notifications_url":"https://api.github.com/repos/mboersma/deis/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mboersma/deis/labels{/name}","releases_url":"https://api.github.com/repos/mboersma/deis/releases{/id}","created_at":"2014-08-13T16:45:46Z","updated_at":"2015-05-07T16:32:10Z","pushed_at":"2015-09-15T03:00:28Z","git_url":"git://github.com/mboersma/deis.git","ssh_url":"git@github.com:mboersma/deis.git","clone_url":"https://github.com/mboersma/deis.git","svn_url":"https://github.com/mboersma/deis","homepage":"http://deis.io","size":20913,"stargazers_count":0,"watchers_count":0,"language":"Python","has_issues":false,"has_downloads":true,"has_wiki":false,"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":"deis:master","ref":"master","sha":"f9cd978ae1ab7c696d2b74cde211b6c3cd2afb3f","user":{"login":"deis","id":6117407,"avatar_url":"https://avatars.githubusercontent.com/u/6117407?v=3","gravatar_id":"","url":"https://api.github.com/users/deis","html_url":"https://github.com/deis","followers_url":"https://api.github.com/users/deis/followers","following_url":"https://api.github.com/users/deis/following{/other_user}","gists_url":"https://api.github.com/users/deis/gists{/gist_id}","starred_url":"https://api.github.com/users/deis/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/deis/subscriptions","organizations_url":"https://api.github.com/users/deis/orgs","repos_url":"https://api.github.com/users/deis/repos","events_url":"https://api.github.com/users/deis/events{/privacy}","received_events_url":"https://api.github.com/users/deis/received_events","type":"Organization","site_admin":false},"repo":{"id":11589713,"name":"deis","full_name":"deis/deis","owner":{"login":"deis","id":6117407,"avatar_url":"https://avatars.githubusercontent.com/u/6117407?v=3","gravatar_id":"","url":"https://api.github.com/users/deis","html_url":"https://github.com/deis","followers_url":"https://api.github.com/users/deis/followers","following_url":"https://api.github.com/users/deis/following{/other_user}","gists_url":"https://api.github.com/users/deis/gists{/gist_id}","starred_url":"https://api.github.com/users/deis/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/deis/subscriptions","organizations_url":"https://api.github.com/users/deis/orgs","repos_url":"https://api.github.com/users/deis/repos","events_url":"https://api.github.com/users/deis/events{/privacy}","received_events_url":"https://api.github.com/users/deis/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/deis/deis","description":"Your PaaS. Your Rules. ","fork":false,"url":"https://api.github.com/repos/deis/deis","forks_url":"https://api.github.com/repos/deis/deis/forks","keys_url":"https://api.github.com/repos/deis/deis/keys{/key_id}","collaborators_url":"https://api.github.com/repos/deis/deis/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/deis/deis/teams","hooks_url":"https://api.github.com/repos/deis/deis/hooks","issue_events_url":"https://api.github.com/repos/deis/deis/issues/events{/number}","events_url":"https://api.github.com/repos/deis/deis/events","assignees_url":"https://api.github.com/repos/deis/deis/assignees{/user}","branches_url":"https://api.github.com/repos/deis/deis/branches{/branch}","tags_url":"https://api.github.com/repos/deis/deis/tags","blobs_url":"https://api.github.com/repos/deis/deis/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/deis/deis/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/deis/deis/git/refs{/sha}","trees_url":"https://api.github.com/repos/deis/deis/git/trees{/sha}","statuses_url":"https://api.github.com/repos/deis/deis/statuses/{sha}","languages_url":"https://api.github.com/repos/deis/deis/languages","stargazers_url":"https://api.github.com/repos/deis/deis/stargazers","contributors_url":"https://api.github.com/repos/deis/deis/contributors","subscribers_url":"https://api.github.com/repos/deis/deis/subscribers","subscription_url":"https://api.github.com/repos/deis/deis/subscription","commits_url":"https://api.github.com/repos/deis/deis/commits{/sha}","git_commits_url":"https://api.github.com/repos/deis/deis/git/commits{/sha}","comments_url":"https://api.github.com/repos/deis/deis/comments{/number}","issue_comment_url":"https://api.github.com/repos/deis/deis/issues/comments{/number}","contents_url":"https://api.github.com/repos/deis/deis/contents/{+path}","compare_url":"https://api.github.com/repos/deis/deis/compare/{base}...{head}","merges_url":"https://api.github.com/repos/deis/deis/merges","archive_url":"https://api.github.com/repos/deis/deis/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/deis/deis/downloads","issues_url":"https://api.github.com/repos/deis/deis/issues{/number}","pulls_url":"https://api.github.com/repos/deis/deis/pulls{/number}","milestones_url":"https://api.github.com/repos/deis/deis/milestones{/number}","notifications_url":"https://api.github.com/repos/deis/deis/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/deis/deis/labels{/name}","releases_url":"https://api.github.com/repos/deis/deis/releases{/id}","created_at":"2013-07-22T19:02:40Z","updated_at":"2015-09-15T14:01:23Z","pushed_at":"2015-09-15T16:18:55Z","git_url":"git://github.com/deis/deis.git","ssh_url":"git@github.com:deis/deis.git","clone_url":"https://github.com/deis/deis.git","svn_url":"https://github.com/deis/deis","homepage":"http://deis.io","size":44638,"stargazers_count":4722,"watchers_count":4722,"language":"Python","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":743,"mirror_url":null,"open_issues_count":279,"forks":743,"open_issues":279,"watchers":4722,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/deis/deis/pulls/4444"},"html":{"href":"https://github.com/deis/deis/pull/4444"},"issue":{"href":"https://api.github.com/repos/deis/deis/issues/4444"},"comments":{"href":"https://api.github.com/repos/deis/deis/issues/4444/comments"},"review_comments":{"href":"https://api.github.com/repos/deis/deis/pulls/4444/comments"},"review_comment":{"href":"https://api.github.com/repos/deis/deis/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/deis/deis/pulls/4444/commits"},"statuses":{"href":"https://api.github.com/repos/deis/deis/statuses/445dbaecfadb1e2690734413cc43f30abcb13b21"}},"merged":true,"mergeable":null,"mergeable_state":"unknown","merged_by":{"login":"mboersma","id":73019,"avatar_url":"https://avatars.githubusercontent.com/u/73019?v=3","gravatar_id":"","url":"https://api.github.com/users/mboersma","html_url":"https://github.com/mboersma","followers_url":"https://api.github.com/users/mboersma/followers","following_url":"https://api.github.com/users/mboersma/following{/other_user}","gists_url":"https://api.github.com/users/mboersma/gists{/gist_id}","starred_url":"https://api.github.com/users/mboersma/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mboersma/subscriptions","organizations_url":"https://api.github.com/users/mboersma/orgs","repos_url":"https://api.github.com/users/mboersma/repos","events_url":"https://api.github.com/users/mboersma/events{/privacy}","received_events_url":"https://api.github.com/users/mboersma/received_events","type":"User","site_admin":false},"comments":8,"review_comments":12,"commits":1,"additions":126,"deletions":211,"changed_files":8}}