Merge branch 'master' of github.com:conjure-up/spells

conjure-up · May 15, 2017 · b05bf46 · b05bf46
2 parents c826ed4 + fdc3681
commit b05bf46
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/canonical-kubernetes/steps/step-01_get-kubectl b/canonical-kubernetes/steps/step-01_get-kubectl
@@ -11,11 +11,16 @@ cmd_to_run="~/bin/kubectl.$JUJU_MODEL"
 juju scp -m $JUJU_CONTROLLER:$JUJU_MODEL kubernetes-master/0:config ~/.kube/config.$JUJU_MODEL
 
 if [[ $(uname -s) = "Darwin" ]]; then
-    curl -sLO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl
+    repo=https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/
+    curl -sLO $repo/kubectl
     chmod +x kubectl
     mv kubectl /usr/local/bin/kubectl
+    curl -sLO $repo/kubefed
+    chmod +x kubefed
+    mv kubefed /usr/local/bin/kubefed
 else
     sudo snap install kubectl --classic 1>&2
+    sudo snap install kubefed --classic 1>&2
 fi
 
 echo "kubectl --kubeconfig=$HOME/.kube/config.$JUJU_MODEL \$@" > $HOME/bin/kubectl.$JUJU_MODEL

diff --git a/canonical-kubernetes/steps/step-01_get-kubectl.yaml b/canonical-kubernetes/steps/step-01_get-kubectl.yaml
@@ -1,4 +1,4 @@
 title: Kubernetes Cluster Controller
-description: Download the kubectl client program to your local host
+description: Download the kubectl and kubefed client programs to your local host
 viewable: True
 sudo: True
diff --git a/kubernetes-core/steps/step-01_get-kubectl b/kubernetes-core/steps/step-01_get-kubectl
@@ -11,11 +11,16 @@ cmd_to_run="~/bin/kubectl.$JUJU_MODEL"
 juju scp -m $JUJU_CONTROLLER:$JUJU_MODEL kubernetes-master/0:config ~/.kube/config.$JUJU_MODEL
 
 if [[ $(uname -s) = "Darwin" ]]; then
-    curl -sLO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/kubectl
+    repo=https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/darwin/amd64/
+    curl -sLO $repo/kubectl
     chmod +x kubectl
     mv kubectl /usr/local/bin/kubectl
+    curl -sLO $repo/kubefed
+    chmod +x kubefed
+    mv kubefed /usr/local/bin/kubefed
 else
     sudo snap install kubectl --classic 1>&2
+    sudo snap install kubefed --classic 1>&2
 fi
 
 echo "kubectl --kubeconfig=$HOME/.kube/config.$JUJU_MODEL \$@" > $HOME/bin/kubectl.$JUJU_MODEL

diff --git a/kubernetes-core/steps/step-01_get-kubectl.yaml b/kubernetes-core/steps/step-01_get-kubectl.yaml
@@ -1,4 +1,4 @@
 title: Kubernetes Cluster Controller
-description: Download the kubectl client program to your local host
+description: Download the kubectl and kubefed client programs to your local host
 viewable: True
 sudo: True