{"action":"created","comment":{"url":"https://api.github.com/repos/kubernetes/kubernetes/pulls/comments/100098907","pull_request_review_id":20794226,"id":100098907,"diff_hunk":"@@ -19,10 +19,27 @@\n TMP_ROOT=\"$(dirname \"${BASH_SOURCE}\")/../..\"\n KUBE_ROOT=$(readlink -e ${TMP_ROOT} 2> /dev/null || perl -MCwd -e 'print Cwd::abs_path shift' ${TMP_ROOT})\n \n-source \"${KUBE_ROOT}/test/kubemark/common.sh\"\n source \"${KUBE_ROOT}/test/kubemark/skeleton/util.sh\"\n source \"${KUBE_ROOT}/test/kubemark/cloud-provider-config.sh\"\n source \"${KUBE_ROOT}/test/kubemark/${CLOUD_PROVIDER}/util.sh\"\n+source \"${KUBE_ROOT}/cluster/kubemark/${CLOUD_PROVIDER}/config-default.sh\"\n+source \"${KUBE_ROOT}/cluster/kubemark/util.sh\"","path":"test/kubemark/start-kubemark.sh","position":9,"original_position":9,"commit_id":"acc33d9b58978c57453ff93c3abd88bd4d61c5d2","original_commit_id":"acc33d9b58978c57453ff93c3abd88bd4d61c5d2","user":{"login":"shyamjvs","id":4333971,"avatar_url":"https://avatars.githubusercontent.com/u/4333971?v=3","gravatar_id":"","url":"https://api.github.com/users/shyamjvs","html_url":"https://github.com/shyamjvs","followers_url":"https://api.github.com/users/shyamjvs/followers","following_url":"https://api.github.com/users/shyamjvs/following{/other_user}","gists_url":"https://api.github.com/users/shyamjvs/gists{/gist_id}","starred_url":"https://api.github.com/users/shyamjvs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/shyamjvs/subscriptions","organizations_url":"https://api.github.com/users/shyamjvs/orgs","repos_url":"https://api.github.com/users/shyamjvs/repos","events_url":"https://api.github.com/users/shyamjvs/events{/privacy}","received_events_url":"https://api.github.com/users/shyamjvs/received_events","type":"User","site_admin":false},"body":"Well believe me, the order of sourcing scripts is a very sensitive issue and after investing a few hours on this, I finally got it working. :)\r\nIt's a long answer to your question, but here's a crisp reply:\r\n- We need to source `cluster/kubemark/${CLOUD_PROVIDER}/config-default.sh` **after** `cluster/kubemark/util.sh`, as `cluster/kubemark/util.sh` calls gce's config-default.sh somewhere inside which sets MASTER_NAME to \"kubernetes-master\", while we want it to be set as \"kubernetes-kubemark-master\"\r\n- We need to also source `cluster/kubemark/${CLOUD_PROVIDER}/config-default.sh` **before** `cluster/kubemark/util.sh` otherwise some variables would be set by `cluster/kubemark/util.sh` that **will not be** over-written by `cluster/kubemark/${CLOUD_PROVIDER}/config-default.sh` due to assignments of the form VAR=\"${VAR:-\"foobar\"}\".\r\n- And regarding the common scripts that you've mentioned, the only common script called (at the top-level) by run-e2e-tests.sh and start-kubemark.sh is `cluster/kubemark/util.sh`, which should be fine. On the other hand, scripts `test/kubemark/skeleton/util.sh` and `test/kubemark/${CLOUD_PROVIDER}/util.sh` (which overwrites the skeleton/util.sh) should only be called in start- and stop-kubemark scripts as those are the only places where we need those functions.\r\n\r\nHope that answers some questions about why I did stuff the way it is done :)","created_at":"2017-02-08T15:57:45Z","updated_at":"2017-02-08T15:57:45Z","html_url":"https://github.com/kubernetes/kubernetes/pull/41134#discussion_r100098907","pull_request_url":"https://api.github.com/repos/kubernetes/kubernetes/pulls/41134","_links":{"self":{"href":"https://api.github.com/repos/kubernetes/kubernetes/pulls/comments/100098907"},"html":{"href":"https://github.com/kubernetes/kubernetes/pull/41134#discussion_r100098907"},"pull_request":{"href":"https://api.github.com/repos/kubernetes/kubernetes/pulls/41134"}}},"pull_request":{"url":"https://api.github.com/repos/kubernetes/kubernetes/pulls/41134","id":105214584,"html_url":"https://github.com/kubernetes/kubernetes/pull/41134","diff_url":"https://github.com/kubernetes/kubernetes/pull/41134.diff","patch_url":"https://github.com/kubernetes/kubernetes/pull/41134.patch","issue_url":"https://api.github.com/repos/kubernetes/kubernetes/issues/41134","number":41134,"state":"open","locked":false,"title":"Refactored kubemark code into provider-specific and provider-independent parts [Part-3]","user":{"login":"shyamjvs","id":4333971,"avatar_url":"https://avatars.githubusercontent.com/u/4333971?v=3","gravatar_id":"","url":"https://api.github.com/users/shyamjvs","html_url":"https://github.com/shyamjvs","followers_url":"https://api.github.com/users/shyamjvs/followers","following_url":"https://api.github.com/users/shyamjvs/following{/other_user}","gists_url":"https://api.github.com/users/shyamjvs/gists{/gist_id}","starred_url":"https://api.github.com/users/shyamjvs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/shyamjvs/subscriptions","organizations_url":"https://api.github.com/users/shyamjvs/orgs","repos_url":"https://api.github.com/users/shyamjvs/repos","events_url":"https://api.github.com/users/shyamjvs/events{/privacy}","received_events_url":"https://api.github.com/users/shyamjvs/received_events","type":"User","site_admin":false},"body":"Fixes #38967\r\nApplying final part of the changes in PR #39033 (which refactored kubemark code completely). The changes included in this PR are:\r\n\r\n- Removed `test/kubemark/common.sh` and moved relevant parts of its code to the right places in start-kubemark/stop-kubemark scripts.\r\n- Added DOCKER_REGISTRY, PROJECT, KUBEMARK_IMAGE_MAKE_TARGET variables to `/test/kubemark/cloud-provider-config.sh` to make the kubemark image push location variable wrt provider.\r\n- Removed get-real-pod-for-hollow-node.sh as it doesn't seem to do anything useful.\r\n\r\n@kubernetes/sig-scalability-misc @wojtek-t @gmarek","created_at":"2017-02-08T13:15:59Z","updated_at":"2017-02-08T15:57:45Z","closed_at":null,"merged_at":null,"merge_commit_sha":"8b622b10e2934011f0949ca395c5eca05e6ad34d","assignee":{"login":"gmarek","id":1703842,"avatar_url":"https://avatars.githubusercontent.com/u/1703842?v=3","gravatar_id":"","url":"https://api.github.com/users/gmarek","html_url":"https://github.com/gmarek","followers_url":"https://api.github.com/users/gmarek/followers","following_url":"https://api.github.com/users/gmarek/following{/other_user}","gists_url":"https://api.github.com/users/gmarek/gists{/gist_id}","starred_url":"https://api.github.com/users/gmarek/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gmarek/subscriptions","organizations_url":"https://api.github.com/users/gmarek/orgs","repos_url":"https://api.github.com/users/gmarek/repos","events_url":"https://api.github.com/users/gmarek/events{/privacy}","received_events_url":"https://api.github.com/users/gmarek/received_events","type":"User","site_admin":false},"assignees":[{"login":"gmarek","id":1703842,"avatar_url":"https://avatars.githubusercontent.com/u/1703842?v=3","gravatar_id":"","url":"https://api.github.com/users/gmarek","html_url":"https://github.com/gmarek","followers_url":"https://api.github.com/users/gmarek/followers","following_url":"https://api.github.com/users/gmarek/following{/other_user}","gists_url":"https://api.github.com/users/gmarek/gists{/gist_id}","starred_url":"https://api.github.com/users/gmarek/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/gmarek/subscriptions","organizations_url":"https://api.github.com/users/gmarek/orgs","repos_url":"https://api.github.com/users/gmarek/repos","events_url":"https://api.github.com/users/gmarek/events{/privacy}","received_events_url":"https://api.github.com/users/gmarek/received_events","type":"User","site_admin":false},{"login":"wojtek-t","id":10743879,"avatar_url":"https://avatars.githubusercontent.com/u/10743879?v=3","gravatar_id":"","url":"https://api.github.com/users/wojtek-t","html_url":"https://github.com/wojtek-t","followers_url":"https://api.github.com/users/wojtek-t/followers","following_url":"https://api.github.com/users/wojtek-t/following{/other_user}","gists_url":"https://api.github.com/users/wojtek-t/gists{/gist_id}","starred_url":"https://api.github.com/users/wojtek-t/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wojtek-t/subscriptions","organizations_url":"https://api.github.com/users/wojtek-t/orgs","repos_url":"https://api.github.com/users/wojtek-t/repos","events_url":"https://api.github.com/users/wojtek-t/events{/privacy}","received_events_url":"https://api.github.com/users/wojtek-t/received_events","type":"User","site_admin":false}],"milestone":null,"commits_url":"https://api.github.com/repos/kubernetes/kubernetes/pulls/41134/commits","review_comments_url":"https://api.github.com/repos/kubernetes/kubernetes/pulls/41134/comments","review_comment_url":"https://api.github.com/repos/kubernetes/kubernetes/pulls/comments{/number}","comments_url":"https://api.github.com/repos/kubernetes/kubernetes/issues/41134/comments","statuses_url":"https://api.github.com/repos/kubernetes/kubernetes/statuses/acc33d9b58978c57453ff93c3abd88bd4d61c5d2","head":{"label":"shyamjvs:refactor-final-blow","ref":"refactor-final-blow","sha":"acc33d9b58978c57453ff93c3abd88bd4d61c5d2","user":{"login":"shyamjvs","id":4333971,"avatar_url":"https://avatars.githubusercontent.com/u/4333971?v=3","gravatar_id":"","url":"https://api.github.com/users/shyamjvs","html_url":"https://github.com/shyamjvs","followers_url":"https://api.github.com/users/shyamjvs/followers","following_url":"https://api.github.com/users/shyamjvs/following{/other_user}","gists_url":"https://api.github.com/users/shyamjvs/gists{/gist_id}","starred_url":"https://api.github.com/users/shyamjvs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/shyamjvs/subscriptions","organizations_url":"https://api.github.com/users/shyamjvs/orgs","repos_url":"https://api.github.com/users/shyamjvs/repos","events_url":"https://api.github.com/users/shyamjvs/events{/privacy}","received_events_url":"https://api.github.com/users/shyamjvs/received_events","type":"User","site_admin":false},"repo":{"id":74686020,"name":"kubernetes","full_name":"shyamjvs/kubernetes","owner":{"login":"shyamjvs","id":4333971,"avatar_url":"https://avatars.githubusercontent.com/u/4333971?v=3","gravatar_id":"","url":"https://api.github.com/users/shyamjvs","html_url":"https://github.com/shyamjvs","followers_url":"https://api.github.com/users/shyamjvs/followers","following_url":"https://api.github.com/users/shyamjvs/following{/other_user}","gists_url":"https://api.github.com/users/shyamjvs/gists{/gist_id}","starred_url":"https://api.github.com/users/shyamjvs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/shyamjvs/subscriptions","organizations_url":"https://api.github.com/users/shyamjvs/orgs","repos_url":"https://api.github.com/users/shyamjvs/repos","events_url":"https://api.github.com/users/shyamjvs/events{/privacy}","received_events_url":"https://api.github.com/users/shyamjvs/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/shyamjvs/kubernetes","description":"Production-Grade Container Scheduling and Management","fork":true,"url":"https://api.github.com/repos/shyamjvs/kubernetes","forks_url":"https://api.github.com/repos/shyamjvs/kubernetes/forks","keys_url":"https://api.github.com/repos/shyamjvs/kubernetes/keys{/key_id}","collaborators_url":"https://api.github.com/repos/shyamjvs/kubernetes/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/shyamjvs/kubernetes/teams","hooks_url":"https://api.github.com/repos/shyamjvs/kubernetes/hooks","issue_events_url":"https://api.github.com/repos/shyamjvs/kubernetes/issues/events{/number}","events_url":"https://api.github.com/repos/shyamjvs/kubernetes/events","assignees_url":"https://api.github.com/repos/shyamjvs/kubernetes/assignees{/user}","branches_url":"https://api.github.com/repos/shyamjvs/kubernetes/branches{/branch}","tags_url":"https://api.github.com/repos/shyamjvs/kubernetes/tags","blobs_url":"https://api.github.com/repos/shyamjvs/kubernetes/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/shyamjvs/kubernetes/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/shyamjvs/kubernetes/git/refs{/sha}","trees_url":"https://api.github.com/repos/shyamjvs/kubernetes/git/trees{/sha}","statuses_url":"https://api.github.com/repos/shyamjvs/kubernetes/statuses/{sha}","languages_url":"https://api.github.com/repos/shyamjvs/kubernetes/languages","stargazers_url":"https://api.github.com/repos/shyamjvs/kubernetes/stargazers","contributors_url":"https://api.github.com/repos/shyamjvs/kubernetes/contributors","subscribers_url":"https://api.github.com/repos/shyamjvs/kubernetes/subscribers","subscription_url":"https://api.github.com/repos/shyamjvs/kubernetes/subscription","commits_url":"https://api.github.com/repos/shyamjvs/kubernetes/commits{/sha}","git_commits_url":"https://api.github.com/repos/shyamjvs/kubernetes/git/commits{/sha}","comments_url":"https://api.github.com/repos/shyamjvs/kubernetes/comments{/number}","issue_comment_url":"https://api.github.com/repos/shyamjvs/kubernetes/issues/comments{/number}","contents_url":"https://api.github.com/repos/shyamjvs/kubernetes/contents/{+path}","compare_url":"https://api.github.com/repos/shyamjvs/kubernetes/compare/{base}...{head}","merges_url":"https://api.github.com/repos/shyamjvs/kubernetes/merges","archive_url":"https://api.github.com/repos/shyamjvs/kubernetes/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/shyamjvs/kubernetes/downloads","issues_url":"https://api.github.com/repos/shyamjvs/kubernetes/issues{/number}","pulls_url":"https://api.github.com/repos/shyamjvs/kubernetes/pulls{/number}","milestones_url":"https://api.github.com/repos/shyamjvs/kubernetes/milestones{/number}","notifications_url":"https://api.github.com/repos/shyamjvs/kubernetes/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/shyamjvs/kubernetes/labels{/name}","releases_url":"https://api.github.com/repos/shyamjvs/kubernetes/releases{/id}","deployments_url":"https://api.github.com/repos/shyamjvs/kubernetes/deployments","created_at":"2016-11-24T15:40:48Z","updated_at":"2017-01-06T09:40:25Z","pushed_at":"2017-02-08T13:10:08Z","git_url":"git://github.com/shyamjvs/kubernetes.git","ssh_url":"git@github.com:shyamjvs/kubernetes.git","clone_url":"https://github.com/shyamjvs/kubernetes.git","svn_url":"https://github.com/shyamjvs/kubernetes","homepage":"http://kubernetes.io","size":405549,"stargazers_count":0,"watchers_count":0,"language":"Go","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"open_issues_count":0,"forks":1,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"kubernetes:master","ref":"master","sha":"d953402cdf414a877cb537d8db46646db38e7bef","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":"2017-02-08T15:29:47Z","pushed_at":"2017-02-08T15:56:16Z","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":544177,"stargazers_count":20406,"watchers_count":20406,"language":"Go","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":true,"forks_count":6969,"mirror_url":null,"open_issues_count":5558,"forks":6969,"open_issues":5558,"watchers":20406,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/kubernetes/kubernetes/pulls/41134"},"html":{"href":"https://github.com/kubernetes/kubernetes/pull/41134"},"issue":{"href":"https://api.github.com/repos/kubernetes/kubernetes/issues/41134"},"comments":{"href":"https://api.github.com/repos/kubernetes/kubernetes/issues/41134/comments"},"review_comments":{"href":"https://api.github.com/repos/kubernetes/kubernetes/pulls/41134/comments"},"review_comment":{"href":"https://api.github.com/repos/kubernetes/kubernetes/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/kubernetes/kubernetes/pulls/41134/commits"},"statuses":{"href":"https://api.github.com/repos/kubernetes/kubernetes/statuses/acc33d9b58978c57453ff93c3abd88bd4d61c5d2"}}}}
{"actor":{"display_login":"shyamjvs"}}