Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Juju kube up #23440

Merged
merged 1 commit into from
Apr 2, 2016
Merged

Juju kube up #23440

merged 1 commit into from
Apr 2, 2016

Conversation

mbruzek
Copy link
Contributor

@mbruzek mbruzek commented Mar 24, 2016

I found some problems with the kube-up script that this pull request addresses. We didn't have the kubectl binary in the correct location.

Just changing where we download the package from the master, and fixing the kube-down.sh script to remove those files.

@k8s-bot
Copy link

k8s-bot commented Mar 24, 2016

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

This message may repeat a few times in short succession due to jenkinsci/ghprb-plugin#292. Sorry.

Otherwise, if this message is too spammy, please complain to ixdy.

2 similar comments
@k8s-bot
Copy link

k8s-bot commented Mar 24, 2016

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

This message may repeat a few times in short succession due to jenkinsci/ghprb-plugin#292. Sorry.

Otherwise, if this message is too spammy, please complain to ixdy.

@k8s-bot
Copy link

k8s-bot commented Mar 24, 2016

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

This message may repeat a few times in short succession due to jenkinsci/ghprb-plugin#292. Sorry.

Otherwise, if this message is too spammy, please complain to ixdy.

@k8s-github-robot
Copy link

Labelling this PR as size/XS

@k8s-github-robot k8s-github-robot added kind/old-docs size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 24, 2016
@lazypower
Copy link
Contributor

@mbruzek Hey thanks for the cleanup in the kube-up script. The auto fetch is a welcome addition

👍 LGTM

@@ -30,6 +30,8 @@ source "${JUJU_PATH}/${KUBE_CONFIG_FILE-config-default.sh}"
source ${JUJU_PATH}/prereqs/ubuntu-juju.sh
export JUJU_REPOSITORY=${JUJU_PATH}/charms
KUBE_BUNDLE_PATH=${JUJU_PATH}/bundles/local.yaml
# The destination directory for the kubectl binary file.
KUBECTL_DIR=${KUBE_ROOT}/platforms/linux/amd64
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

must be quoted (this whole file does a terrible job quoting bash variable, so lets start making them better)
KUBECTL_DIR="${KUBE_ROOT}/platforms/linux/amd64

This applies to every line you touch. I won't comment on every single line :)

@eparis
Copy link
Contributor

eparis commented Apr 1, 2016

So I don't get it. All you did was move the destination directory and change the KUBECONFIG to point to this new destination dir. What was wrong with the old destination directory? How does this fix something? Is there some random by chance side effect that code is looking at KUBEROOT/platform/... which is just waiting to be broken in the future? Is KUBECONFIG inadequate?

@mbruzek
Copy link
Contributor Author

mbruzek commented Apr 1, 2016

@eparis Thanks for the review! The reason for this PR is to get the kube-up.sh script to complete successfully. Before this PR the script did not know where kubectl binary was expanded. We found the platforms/... is in the directory search path of kubectl.sh so we now expand it there. This change basically makes the juju kube-up.sh script work.

Yes the path is hardcoded, because the cluster/juju/util.sh script does not yet do architecture/platform detection. We could certainly do that, but the charm only grabs the amd64 binary at this point, so detecting architecture did not seem necessary.

I will make the changes to quote the strings and ping you when that is done. Thanks again for the review!

@eparis
Copy link
Contributor

eparis commented Apr 1, 2016

So rather than having it find it by random side effect, why didn't you set KUBECTL_PATH ? Or put it in the $PATH ?

@eparis
Copy link
Contributor

eparis commented Apr 1, 2016

to be fair, I'm fine with the change in location AND setting KUBECTL_PATH....

@eparis
Copy link
Contributor

eparis commented Apr 1, 2016

ok to test

@eparis eparis added e2e-not-required release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Apr 1, 2016
@eparis
Copy link
Contributor

eparis commented Apr 1, 2016

please squash to one commit.

@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

@googlebot googlebot added cla: no and removed cla: yes labels Apr 1, 2016
@eparis
Copy link
Contributor

eparis commented Apr 1, 2016

I think your squash went badly.....

@mbruzek
Copy link
Contributor Author

mbruzek commented Apr 1, 2016

@eparis working on it.

@googlebot
Copy link

CLAs look good, thanks!

@googlebot googlebot added cla: yes and removed cla: no labels Apr 1, 2016
@eparis eparis added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 1, 2016
@eparis
Copy link
Contributor

eparis commented Apr 1, 2016

that looks much happier :)

@k8s-github-robot
Copy link

Labelling this PR as size/S

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed kind/old-docs size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 1, 2016
@k8s-bot
Copy link

k8s-bot commented Apr 1, 2016

GCE e2e build/test passed for commit 2c8736d2d9dbd8b99a6520983a8e28ff2889e83b.

@k8s-bot
Copy link

k8s-bot commented Apr 1, 2016

GCE e2e build/test passed for commit 03002a16dc6dbe0f211a00cfe0cb595922fe45bb.

@k8s-bot
Copy link

k8s-bot commented Apr 1, 2016

GCE e2e build/test passed for commit 64d849e.

@k8s-github-robot
Copy link

The author of this PR is not in the whitelist for merge, can one of the admins add the 'ok-to-merge' label?

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 372c164 into kubernetes:master Apr 2, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants