{"action":"created","comment":{"url":"https://api.github.com/repos/coreos/kube-aws/pulls/comments/91771958","pull_request_review_id":12284497,"id":91771958,"diff_hunk":"@@ -380,14 +327,241 @@ write_files:\n       exec nsenter -m -u -i -n -p -t 1 -- /usr/bin/rkt \"$@\"\n \n {{ if .UseCalico }}\n-  - path: /opt/bin/install-calico-system\n-    permissions: 0700\n+  - path: /srv/kubernetes/manifests/calico.yaml\n+    content: |\n+      kind: ConfigMap\n+      apiVersion: v1\n+      metadata:\n+        name: calico-config \n+        namespace: kube-system\n+      data:\n+        etcd_endpoints: \"{{ .EtcdEndpoints }}\"\n+        cni_network_config: |-\n+          {\n+              \"name\": \"calico\",\n+              \"type\": \"flannel\",\n+              \"delegate\": {\n+                  \"type\": \"calico\",\n+                  \"etcd_endpoints\": \"__ETCD_ENDPOINTS__\",\n+                  \"etcd_key_file\": \"__ETCD_KEY_FILE__\",\n+                  \"etcd_cert_file\": \"__ETCD_CERT_FILE__\",\n+                  \"etcd_ca_cert_file\": \"__ETCD_CA_CERT_FILE__\",\n+                  \"log_level\": \"info\",\n+                  \"policy\": {\n+                      \"type\": \"k8s\",\n+                      \"k8s_api_root\": \"https://__KUBERNETES_SERVICE_HOST__:__KUBERNETES_SERVICE_PORT__\",\n+                      \"k8s_auth_token\": \"__SERVICEACCOUNT_TOKEN__\"\n+                  },\n+                  \"kubernetes\": {\n+                      \"kubeconfig\": \"__KUBECONFIG_FILEPATH__\"\n+                  }\n+              }\n+          }\n+\n+        etcd_ca: \"/calico-secrets/etcd-ca\"\n+        etcd_cert: \"/calico-secrets/etcd-cert\"\n+        etcd_key: \"/calico-secrets/etcd-key\"\n+\n+      ---\n+\n+      apiVersion: v1\n+      kind: Secret\n+      type: Opaque\n+      metadata:\n+        name: calico-etcd-secrets\n+        namespace: kube-system\n+      data:\n+        etcd-key: \"$ETCDKEY\"\n+        etcd-cert: \"$ETCDCERT\"\n+        etcd-ca: \"$ETCDCA\"\n+\n+      ---\n+\n+      kind: DaemonSet\n+      apiVersion: extensions/v1beta1\n+      metadata:\n+        name: calico-node\n+        namespace: kube-system\n+        labels:\n+          k8s-app: calico-node\n+      spec:\n+        selector:\n+          matchLabels:\n+            k8s-app: calico-node\n+        template:\n+          metadata:\n+            labels:\n+              k8s-app: calico-node\n+            annotations:\n+              scheduler.alpha.kubernetes.io/critical-pod: ''\n+              scheduler.alpha.kubernetes.io/tolerations: |\n+                [{\"key\": \"dedicated\", \"value\": \"master\", \"effect\": \"NoSchedule\" },","path":"config/templates/cloud-config-controller","position":181,"original_position":181,"commit_id":"941b28b4ca6474b7c344492d6ef320b942a7263d","original_commit_id":"941b28b4ca6474b7c344492d6ef320b942a7263d","user":{"login":"heschlie","id":4544262,"avatar_url":"https://avatars.githubusercontent.com/u/4544262?v=3","gravatar_id":"","url":"https://api.github.com/users/heschlie","html_url":"https://github.com/heschlie","followers_url":"https://api.github.com/users/heschlie/followers","following_url":"https://api.github.com/users/heschlie/following{/other_user}","gists_url":"https://api.github.com/users/heschlie/gists{/gist_id}","starred_url":"https://api.github.com/users/heschlie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/heschlie/subscriptions","organizations_url":"https://api.github.com/users/heschlie/orgs","repos_url":"https://api.github.com/users/heschlie/repos","events_url":"https://api.github.com/users/heschlie/events{/privacy}","received_events_url":"https://api.github.com/users/heschlie/received_events","type":"User","site_admin":false},"body":"I believe kops taints the masters by default, emphasis on the think!","created_at":"2016-12-09T18:49:38Z","updated_at":"2016-12-09T18:49:38Z","html_url":"https://github.com/coreos/kube-aws/pull/124#discussion_r91771958","pull_request_url":"https://api.github.com/repos/coreos/kube-aws/pulls/124","_links":{"self":{"href":"https://api.github.com/repos/coreos/kube-aws/pulls/comments/91771958"},"html":{"href":"https://github.com/coreos/kube-aws/pull/124#discussion_r91771958"},"pull_request":{"href":"https://api.github.com/repos/coreos/kube-aws/pulls/124"}}},"pull_request":{"url":"https://api.github.com/repos/coreos/kube-aws/pulls/124","id":96639851,"html_url":"https://github.com/coreos/kube-aws/pull/124","diff_url":"https://github.com/coreos/kube-aws/pull/124.diff","patch_url":"https://github.com/coreos/kube-aws/pull/124.patch","issue_url":"https://api.github.com/repos/coreos/kube-aws/issues/124","number":124,"state":"open","locked":false,"title":"Calico self hosted integration","user":{"login":"heschlie","id":4544262,"avatar_url":"https://avatars.githubusercontent.com/u/4544262?v=3","gravatar_id":"","url":"https://api.github.com/users/heschlie","html_url":"https://github.com/heschlie","followers_url":"https://api.github.com/users/heschlie/followers","following_url":"https://api.github.com/users/heschlie/following{/other_user}","gists_url":"https://api.github.com/users/heschlie/gists{/gist_id}","starred_url":"https://api.github.com/users/heschlie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/heschlie/subscriptions","organizations_url":"https://api.github.com/users/heschlie/orgs","repos_url":"https://api.github.com/users/heschlie/repos","events_url":"https://api.github.com/users/heschlie/events{/privacy}","received_events_url":"https://api.github.com/users/heschlie/received_events","type":"User","site_admin":false},"body":"- Migrated Calico to self hosted install\r\n- Updated Calico versions","created_at":"2016-12-06T00:44:22Z","updated_at":"2016-12-09T18:49:38Z","closed_at":null,"merged_at":null,"merge_commit_sha":"dc2011aeff14e2c051f12187d7fa87d90b84fd3f","assignee":null,"assignees":[],"milestone":null,"commits_url":"https://api.github.com/repos/coreos/kube-aws/pulls/124/commits","review_comments_url":"https://api.github.com/repos/coreos/kube-aws/pulls/124/comments","review_comment_url":"https://api.github.com/repos/coreos/kube-aws/pulls/comments{/number}","comments_url":"https://api.github.com/repos/coreos/kube-aws/issues/124/comments","statuses_url":"https://api.github.com/repos/coreos/kube-aws/statuses/941b28b4ca6474b7c344492d6ef320b942a7263d","head":{"label":"heschlie:calico-self-hosted","ref":"calico-self-hosted","sha":"941b28b4ca6474b7c344492d6ef320b942a7263d","user":{"login":"heschlie","id":4544262,"avatar_url":"https://avatars.githubusercontent.com/u/4544262?v=3","gravatar_id":"","url":"https://api.github.com/users/heschlie","html_url":"https://github.com/heschlie","followers_url":"https://api.github.com/users/heschlie/followers","following_url":"https://api.github.com/users/heschlie/following{/other_user}","gists_url":"https://api.github.com/users/heschlie/gists{/gist_id}","starred_url":"https://api.github.com/users/heschlie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/heschlie/subscriptions","organizations_url":"https://api.github.com/users/heschlie/orgs","repos_url":"https://api.github.com/users/heschlie/repos","events_url":"https://api.github.com/users/heschlie/events{/privacy}","received_events_url":"https://api.github.com/users/heschlie/received_events","type":"User","site_admin":false},"repo":{"id":75236546,"name":"kube-aws","full_name":"heschlie/kube-aws","owner":{"login":"heschlie","id":4544262,"avatar_url":"https://avatars.githubusercontent.com/u/4544262?v=3","gravatar_id":"","url":"https://api.github.com/users/heschlie","html_url":"https://github.com/heschlie","followers_url":"https://api.github.com/users/heschlie/followers","following_url":"https://api.github.com/users/heschlie/following{/other_user}","gists_url":"https://api.github.com/users/heschlie/gists{/gist_id}","starred_url":"https://api.github.com/users/heschlie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/heschlie/subscriptions","organizations_url":"https://api.github.com/users/heschlie/orgs","repos_url":"https://api.github.com/users/heschlie/repos","events_url":"https://api.github.com/users/heschlie/events{/privacy}","received_events_url":"https://api.github.com/users/heschlie/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/heschlie/kube-aws","description":"CoreOS Kubernetes on AWS","fork":true,"url":"https://api.github.com/repos/heschlie/kube-aws","forks_url":"https://api.github.com/repos/heschlie/kube-aws/forks","keys_url":"https://api.github.com/repos/heschlie/kube-aws/keys{/key_id}","collaborators_url":"https://api.github.com/repos/heschlie/kube-aws/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/heschlie/kube-aws/teams","hooks_url":"https://api.github.com/repos/heschlie/kube-aws/hooks","issue_events_url":"https://api.github.com/repos/heschlie/kube-aws/issues/events{/number}","events_url":"https://api.github.com/repos/heschlie/kube-aws/events","assignees_url":"https://api.github.com/repos/heschlie/kube-aws/assignees{/user}","branches_url":"https://api.github.com/repos/heschlie/kube-aws/branches{/branch}","tags_url":"https://api.github.com/repos/heschlie/kube-aws/tags","blobs_url":"https://api.github.com/repos/heschlie/kube-aws/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/heschlie/kube-aws/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/heschlie/kube-aws/git/refs{/sha}","trees_url":"https://api.github.com/repos/heschlie/kube-aws/git/trees{/sha}","statuses_url":"https://api.github.com/repos/heschlie/kube-aws/statuses/{sha}","languages_url":"https://api.github.com/repos/heschlie/kube-aws/languages","stargazers_url":"https://api.github.com/repos/heschlie/kube-aws/stargazers","contributors_url":"https://api.github.com/repos/heschlie/kube-aws/contributors","subscribers_url":"https://api.github.com/repos/heschlie/kube-aws/subscribers","subscription_url":"https://api.github.com/repos/heschlie/kube-aws/subscription","commits_url":"https://api.github.com/repos/heschlie/kube-aws/commits{/sha}","git_commits_url":"https://api.github.com/repos/heschlie/kube-aws/git/commits{/sha}","comments_url":"https://api.github.com/repos/heschlie/kube-aws/comments{/number}","issue_comment_url":"https://api.github.com/repos/heschlie/kube-aws/issues/comments{/number}","contents_url":"https://api.github.com/repos/heschlie/kube-aws/contents/{+path}","compare_url":"https://api.github.com/repos/heschlie/kube-aws/compare/{base}...{head}","merges_url":"https://api.github.com/repos/heschlie/kube-aws/merges","archive_url":"https://api.github.com/repos/heschlie/kube-aws/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/heschlie/kube-aws/downloads","issues_url":"https://api.github.com/repos/heschlie/kube-aws/issues{/number}","pulls_url":"https://api.github.com/repos/heschlie/kube-aws/pulls{/number}","milestones_url":"https://api.github.com/repos/heschlie/kube-aws/milestones{/number}","notifications_url":"https://api.github.com/repos/heschlie/kube-aws/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/heschlie/kube-aws/labels{/name}","releases_url":"https://api.github.com/repos/heschlie/kube-aws/releases{/id}","deployments_url":"https://api.github.com/repos/heschlie/kube-aws/deployments","created_at":"2016-11-30T23:31:38Z","updated_at":"2016-11-30T23:31:39Z","pushed_at":"2016-12-06T02:07:32Z","git_url":"git://github.com/heschlie/kube-aws.git","ssh_url":"git@github.com:heschlie/kube-aws.git","clone_url":"https://github.com/heschlie/kube-aws.git","svn_url":"https://github.com/heschlie/kube-aws","homepage":null,"size":18998,"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":"coreos:master","ref":"master","sha":"8fe74d9d141f4352f0e1bbb32f9fe41f2b43863a","user":{"login":"coreos","id":3730757,"avatar_url":"https://avatars.githubusercontent.com/u/3730757?v=3","gravatar_id":"","url":"https://api.github.com/users/coreos","html_url":"https://github.com/coreos","followers_url":"https://api.github.com/users/coreos/followers","following_url":"https://api.github.com/users/coreos/following{/other_user}","gists_url":"https://api.github.com/users/coreos/gists{/gist_id}","starred_url":"https://api.github.com/users/coreos/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/coreos/subscriptions","organizations_url":"https://api.github.com/users/coreos/orgs","repos_url":"https://api.github.com/users/coreos/repos","events_url":"https://api.github.com/users/coreos/events{/privacy}","received_events_url":"https://api.github.com/users/coreos/received_events","type":"Organization","site_admin":false},"repo":{"id":70860688,"name":"kube-aws","full_name":"coreos/kube-aws","owner":{"login":"coreos","id":3730757,"avatar_url":"https://avatars.githubusercontent.com/u/3730757?v=3","gravatar_id":"","url":"https://api.github.com/users/coreos","html_url":"https://github.com/coreos","followers_url":"https://api.github.com/users/coreos/followers","following_url":"https://api.github.com/users/coreos/following{/other_user}","gists_url":"https://api.github.com/users/coreos/gists{/gist_id}","starred_url":"https://api.github.com/users/coreos/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/coreos/subscriptions","organizations_url":"https://api.github.com/users/coreos/orgs","repos_url":"https://api.github.com/users/coreos/repos","events_url":"https://api.github.com/users/coreos/events{/privacy}","received_events_url":"https://api.github.com/users/coreos/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/coreos/kube-aws","description":"CoreOS Kubernetes on AWS","fork":false,"url":"https://api.github.com/repos/coreos/kube-aws","forks_url":"https://api.github.com/repos/coreos/kube-aws/forks","keys_url":"https://api.github.com/repos/coreos/kube-aws/keys{/key_id}","collaborators_url":"https://api.github.com/repos/coreos/kube-aws/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/coreos/kube-aws/teams","hooks_url":"https://api.github.com/repos/coreos/kube-aws/hooks","issue_events_url":"https://api.github.com/repos/coreos/kube-aws/issues/events{/number}","events_url":"https://api.github.com/repos/coreos/kube-aws/events","assignees_url":"https://api.github.com/repos/coreos/kube-aws/assignees{/user}","branches_url":"https://api.github.com/repos/coreos/kube-aws/branches{/branch}","tags_url":"https://api.github.com/repos/coreos/kube-aws/tags","blobs_url":"https://api.github.com/repos/coreos/kube-aws/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/coreos/kube-aws/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/coreos/kube-aws/git/refs{/sha}","trees_url":"https://api.github.com/repos/coreos/kube-aws/git/trees{/sha}","statuses_url":"https://api.github.com/repos/coreos/kube-aws/statuses/{sha}","languages_url":"https://api.github.com/repos/coreos/kube-aws/languages","stargazers_url":"https://api.github.com/repos/coreos/kube-aws/stargazers","contributors_url":"https://api.github.com/repos/coreos/kube-aws/contributors","subscribers_url":"https://api.github.com/repos/coreos/kube-aws/subscribers","subscription_url":"https://api.github.com/repos/coreos/kube-aws/subscription","commits_url":"https://api.github.com/repos/coreos/kube-aws/commits{/sha}","git_commits_url":"https://api.github.com/repos/coreos/kube-aws/git/commits{/sha}","comments_url":"https://api.github.com/repos/coreos/kube-aws/comments{/number}","issue_comment_url":"https://api.github.com/repos/coreos/kube-aws/issues/comments{/number}","contents_url":"https://api.github.com/repos/coreos/kube-aws/contents/{+path}","compare_url":"https://api.github.com/repos/coreos/kube-aws/compare/{base}...{head}","merges_url":"https://api.github.com/repos/coreos/kube-aws/merges","archive_url":"https://api.github.com/repos/coreos/kube-aws/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/coreos/kube-aws/downloads","issues_url":"https://api.github.com/repos/coreos/kube-aws/issues{/number}","pulls_url":"https://api.github.com/repos/coreos/kube-aws/pulls{/number}","milestones_url":"https://api.github.com/repos/coreos/kube-aws/milestones{/number}","notifications_url":"https://api.github.com/repos/coreos/kube-aws/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/coreos/kube-aws/labels{/name}","releases_url":"https://api.github.com/repos/coreos/kube-aws/releases{/id}","deployments_url":"https://api.github.com/repos/coreos/kube-aws/deployments","created_at":"2016-10-14T00:57:33Z","updated_at":"2016-12-09T09:27:16Z","pushed_at":"2016-12-08T12:04:02Z","git_url":"git://github.com/coreos/kube-aws.git","ssh_url":"git@github.com:coreos/kube-aws.git","clone_url":"https://github.com/coreos/kube-aws.git","svn_url":"https://github.com/coreos/kube-aws","homepage":null,"size":19154,"stargazers_count":96,"watchers_count":96,"language":"Go","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":25,"mirror_url":null,"open_issues_count":29,"forks":25,"open_issues":29,"watchers":96,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/coreos/kube-aws/pulls/124"},"html":{"href":"https://github.com/coreos/kube-aws/pull/124"},"issue":{"href":"https://api.github.com/repos/coreos/kube-aws/issues/124"},"comments":{"href":"https://api.github.com/repos/coreos/kube-aws/issues/124/comments"},"review_comments":{"href":"https://api.github.com/repos/coreos/kube-aws/pulls/124/comments"},"review_comment":{"href":"https://api.github.com/repos/coreos/kube-aws/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/coreos/kube-aws/pulls/124/commits"},"statuses":{"href":"https://api.github.com/repos/coreos/kube-aws/statuses/941b28b4ca6474b7c344492d6ef320b942a7263d"}}}}
{"actor":{"display_login":"heschlie"}}