Merge pull request #5498 from ZJU-SEL/refactor-ubuntu

Ubuntu-distro: deprecate & merge ubuntu single node work to ubuntu cluster node stuff
kubernetes · May 7, 2015 · 36bb479 · 36bb479
2 parents e25210d + 595345c
commit 36bb479
Show file tree

Hide file tree

Showing 54 changed files with 887 additions and 1,377 deletions.
diff --git a/cluster/kubectl.sh b/cluster/kubectl.sh
@@ -107,6 +107,11 @@ if [[ "$KUBERNETES_PROVIDER" == "gke" ]]; then
     "--kubeconfig=${HOME}/.config/gcloud/kubernetes/kubeconfig"
     "--context=gke_${PROJECT}_${ZONE}_${CLUSTER_NAME}"
   )
+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/build.sh b/cluster/ubuntu-cluster/build.sh
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