Merge dev branch to pr branch including remote deploy

kubernetes · Apr 22, 2015 · 8d6beb4 · 8d6beb4
2 parents 0314fc6 + 4e915f4
commit 8d6beb4
Show file tree

Hide file tree

Showing 35 changed files with 374 additions and 559 deletions.
diff --git a/cluster/kubectl.sh b/cluster/kubectl.sh
@@ -120,6 +120,17 @@ elif [[ "$KUBERNETES_PROVIDER" == "vagrant" ]]; then
   config=(
     "--kubeconfig=$HOME/.kubernetes_vagrant_kubeconfig"
   )
+
+elif [[ "$KUBERNETES_PROVIDER" == "libvirt-coreos" ]]; then
+  detect-master > /dev/null
+  config=(
+    "--server=http://${KUBE_MASTER_IP}:8080"
+  )
+elif [[ "$KUBERNETES_PROVIDER" == "ubuntu" ]]; then
+  detect-master > /dev/null
+  config=(
+    "--server=http://${KUBE_MASTER_IP}:8080"
+  )
 fi
 
 echo "current-context: \"$(${kubectl} "${config[@]:+${config[@]}}" config view -o template --template='{{index . "current-context"}}')\"" >&2

diff --git a/cluster/ubuntu-cluster/configure.sh b/cluster/ubuntu-cluster/configure.sh
diff --git a/cluster/ubuntu-cluster/default_scripts/etcd b/cluster/ubuntu-cluster/default_scripts/etcd
diff --git a/cluster/ubuntu-cluster/default_scripts/flanneld b/cluster/ubuntu-cluster/default_scripts/flanneld
diff --git a/cluster/ubuntu-cluster/default_scripts/kube-apiserver b/cluster/ubuntu-cluster/default_scripts/kube-apiserver
diff --git a/cluster/ubuntu-cluster/default_scripts/kube-controller-manager b/cluster/ubuntu-cluster/default_scripts/kube-controller-manager
diff --git a/cluster/ubuntu-cluster/default_scripts/kube-proxy b/cluster/ubuntu-cluster/default_scripts/kube-proxy
diff --git a/cluster/ubuntu-cluster/default_scripts/kube-scheduler b/cluster/ubuntu-cluster/default_scripts/kube-scheduler
diff --git a/cluster/ubuntu-cluster/default_scripts/kubelet b/cluster/ubuntu-cluster/default_scripts/kubelet
diff --git a/cluster/ubuntu-cluster/build.sh → cluster/ubuntu/build.sh b/cluster/ubuntu-cluster/build.sh → cluster/ubuntu/build.sh
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Download the etcd, flannel, and K8s binaries automatically
+# Download the etcd, flannel, and K8s binaries automatically and stored in binaries directory
 # Run as root only
 
 # author @resouer @WIZARD-CXY
@@ -60,7 +60,7 @@ cp $ETCD/etcd $ETCD/etcdctl binaries
 # k8s
 echo "Download kubernetes release ..."
 
-K8S_V="v0.12.0"
+K8S_V="v0.15.0"
 if [ ! -f kubernetes.tar.gz ] ; then
     curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/$K8S_V/kubernetes.tar.gz -o kubernetes.tar.gz
     tar xzf kubernetes.tar.gz