From 82aaf118e2e97d8edecda71e0b95bdef0851ce53 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 10 Sep 2015 15:38:12 +0000 Subject: [PATCH] remove the dependency on brctl, update default config and rephrase minion to node --- cluster/centos/.gitignore | 13 +++++----- cluster/centos/build.sh | 24 ++++--------------- cluster/centos/config-build.sh | 4 ++-- cluster/centos/config-default.sh | 9 ++++--- .../{minion => node}/bin/mk-docker-opts.sh | 0 .../{minion => node}/bin/remove-docker0.sh | 4 ++-- .../centos/{minion => node}/scripts/docker.sh | 0 .../{minion => node}/scripts/flannel.sh | 0 .../{minion => node}/scripts/kubelet.sh | 0 .../centos/{minion => node}/scripts/proxy.sh | 0 cluster/centos/util.sh | 12 +++++----- 11 files changed, 25 insertions(+), 41 deletions(-) rename cluster/centos/{minion => node}/bin/mk-docker-opts.sh (100%) rename cluster/centos/{minion => node}/bin/remove-docker0.sh (95%) rename cluster/centos/{minion => node}/scripts/docker.sh (100%) rename cluster/centos/{minion => node}/scripts/flannel.sh (100%) rename cluster/centos/{minion => node}/scripts/kubelet.sh (100%) rename cluster/centos/{minion => node}/scripts/proxy.sh (100%) diff --git a/cluster/centos/.gitignore b/cluster/centos/.gitignore index 56aad3778f4..c97ce235be4 100644 --- a/cluster/centos/.gitignore +++ b/cluster/centos/.gitignore @@ -4,10 +4,9 @@ master/bin/etcd master/bin/etcdctl master/bin/kube* -minion/bin/brctl -minion/bin/docker -minion/bin/etcd -minion/bin/etcdctl -minion/bin/flanneld -minion/bin/kube* -test.sh \ No newline at end of file +node/bin/docker +node/bin/etcd +node/bin/etcdctl +node/bin/flanneld +node/bin/kube* +local-test.sh diff --git a/cluster/centos/build.sh b/cluster/centos/build.sh index a624ade1310..55a675fad0d 100755 --- a/cluster/centos/build.sh +++ b/cluster/centos/build.sh @@ -54,28 +54,18 @@ function download-releases() { echo "Download docker-latest ..." curl -L https://get.docker.com/builds/Linux/x86_64/docker-latest -o ${RELEASES_DIR}/docker - - echo "Download bridge-utils from yum repo ..." - sudo yum --downloadonly --downloaddir=${RELEASES_DIR} install bridge-utils - - mkdir -p ${RELEASES_DIR}/brctl-tmp - local rpm_file=$(ls ${RELEASES_DIR}/bridge-utils-*.rpm) - pushd ${RELEASES_DIR}/brctl-tmp >/dev/null 2>&1 - rpm2cpio ${rpm_file} | cpio -id - popd >/dev/null 2>&1 - cp ${RELEASES_DIR}/brctl-tmp/usr/sbin/brctl ${RELEASES_DIR} } function unpack-releases() { rm -rf ${BINARY_DIR} mkdir -p ${BINARY_DIR}/master/bin - mkdir -p ${BINARY_DIR}/minion/bin + mkdir -p ${BINARY_DIR}/node/bin # flannel if [[ -f ${RELEASES_DIR}/flannel.tar.gz ]] ; then tar xzf ${RELEASES_DIR}/flannel.tar.gz -C ${RELEASES_DIR} cp ${RELEASES_DIR}/flannel-${FLANNEL_VERSION}/flanneld ${BINARY_DIR}/master/bin - cp ${RELEASES_DIR}/flannel-${FLANNEL_VERSION}/flanneld ${BINARY_DIR}/minion/bin + cp ${RELEASES_DIR}/flannel-${FLANNEL_VERSION}/flanneld ${BINARY_DIR}/node/bin fi # ectd @@ -85,7 +75,7 @@ function unpack-releases() { cp ${RELEASES_DIR}/$ETCD/etcd \ ${RELEASES_DIR}/$ETCD/etcdctl ${BINARY_DIR}/master/bin cp ${RELEASES_DIR}/$ETCD/etcd \ - ${RELEASES_DIR}/$ETCD/etcdctl ${BINARY_DIR}/minion/bin + ${RELEASES_DIR}/$ETCD/etcdctl ${BINARY_DIR}/node/bin fi # k8s @@ -100,17 +90,13 @@ function unpack-releases() { ${RELEASES_DIR}/kubernetes/server/kubernetes/server/bin/kube-scheduler ${BINARY_DIR}/master/bin cp ${RELEASES_DIR}/kubernetes/server/kubernetes/server/bin/kubelet \ - ${RELEASES_DIR}/kubernetes/server/kubernetes/server/bin/kube-proxy ${BINARY_DIR}/minion/bin + ${RELEASES_DIR}/kubernetes/server/kubernetes/server/bin/kube-proxy ${BINARY_DIR}/node/bin cp ${RELEASES_DIR}/kubernetes/server/kubernetes/server/bin/kubectl ${BINARY_DIR} fi if [[ -f ${RELEASES_DIR}/docker ]]; then - cp ${RELEASES_DIR}/docker ${BINARY_DIR}/minion/bin - fi - - if [[ -f ${RELEASES_DIR}/brctl ]]; then - cp ${RELEASES_DIR}/brctl ${BINARY_DIR}/minion/bin + cp ${RELEASES_DIR}/docker ${BINARY_DIR}/node/bin fi chmod -R +x ${BINARY_DIR} diff --git a/cluster/centos/config-build.sh b/cluster/centos/config-build.sh index a3fc754752b..879a7e0cad3 100755 --- a/cluster/centos/config-build.sh +++ b/cluster/centos/config-build.sh @@ -20,13 +20,13 @@ RELEASES_DIR=${RELEASES_DIR:-/tmp/downloads} # Define flannel version to use. -FLANNEL_VERSION=${FLANNEL_VERSION:-"0.4.0"} +FLANNEL_VERSION=${FLANNEL_VERSION:-"0.5.3"} # Define etcd version to use. ETCD_VERSION=${ETCD_VERSION:-"2.0.12"} # Define k8s version to use. -K8S_VERSION=${K8S_VERSION:-"1.0.1"} +K8S_VERSION=${K8S_VERSION:-"1.0.4"} FLANNEL_DOWNLOAD_URL=\ "https://github.com/coreos/flannel/releases/download/v${FLANNEL_VERSION}/flannel-${FLANNEL_VERSION}-linux-amd64.tar.gz" diff --git a/cluster/centos/config-default.sh b/cluster/centos/config-default.sh index da60816435f..beb0841bf78 100755 --- a/cluster/centos/config-default.sh +++ b/cluster/centos/config-default.sh @@ -15,15 +15,14 @@ # limitations under the License. ## Contains configuration values for the CentOS cluster - -# Currently only support root user. -export MASTER=${MASTER:-"root@8.8.8.18"} +# The user should have sudo privilege +export MASTER=${MASTER:-"centos@172.10.0.11"} export MASTER_IP=${MASTER#*@} # Define all your minion nodes, # And separated with blank space like . -# Currently only support root user. -export MINIONS=${MINIONS:-"root@8.8.8.20 root@8.8.8.21"} +# The user should have sudo privilege +export MINIONS=${MINIONS:-"centos@172.10.0.12 centos@172.10.0.13"} # If it practically impossible to set an array as an environment variable # from a script, so assume variable is a string then convert it to an array export MINIONS_ARRAY=($MINIONS) diff --git a/cluster/centos/minion/bin/mk-docker-opts.sh b/cluster/centos/node/bin/mk-docker-opts.sh similarity index 100% rename from cluster/centos/minion/bin/mk-docker-opts.sh rename to cluster/centos/node/bin/mk-docker-opts.sh diff --git a/cluster/centos/minion/bin/remove-docker0.sh b/cluster/centos/node/bin/remove-docker0.sh similarity index 95% rename from cluster/centos/minion/bin/remove-docker0.sh rename to cluster/centos/node/bin/remove-docker0.sh index 4d016fc9246..31a90c50c79 100755 --- a/cluster/centos/minion/bin/remove-docker0.sh +++ b/cluster/centos/node/bin/remove-docker0.sh @@ -23,5 +23,5 @@ rc=0 ip link show docker0 >/dev/null 2>&1 || rc="$?" if [[ "$rc" -eq "0" ]]; then ip link set dev docker0 down - /opt/kubernetes/bin/brctl delbr docker0 -fi \ No newline at end of file + ip link delete docker0 +fi diff --git a/cluster/centos/minion/scripts/docker.sh b/cluster/centos/node/scripts/docker.sh similarity index 100% rename from cluster/centos/minion/scripts/docker.sh rename to cluster/centos/node/scripts/docker.sh diff --git a/cluster/centos/minion/scripts/flannel.sh b/cluster/centos/node/scripts/flannel.sh similarity index 100% rename from cluster/centos/minion/scripts/flannel.sh rename to cluster/centos/node/scripts/flannel.sh diff --git a/cluster/centos/minion/scripts/kubelet.sh b/cluster/centos/node/scripts/kubelet.sh similarity index 100% rename from cluster/centos/minion/scripts/kubelet.sh rename to cluster/centos/node/scripts/kubelet.sh diff --git a/cluster/centos/minion/scripts/proxy.sh b/cluster/centos/node/scripts/proxy.sh similarity index 100% rename from cluster/centos/minion/scripts/proxy.sh rename to cluster/centos/node/scripts/proxy.sh diff --git a/cluster/centos/util.sh b/cluster/centos/util.sh index 27dfc0f4ef1..9242d9b1904 100755 --- a/cluster/centos/util.sh +++ b/cluster/centos/util.sh @@ -264,14 +264,14 @@ function provision-minion() { ensure-setup-dir ${minion} # scp -r ${SSH_OPTS} minion config-default.sh copy-files.sh util.sh "${minion_ip}:${KUBE_TEMP}" - kube-scp ${minion} "${ROOT}/binaries/minion ${ROOT}/minion ${ROOT}/config-default.sh ${ROOT}/util.sh" ${KUBE_TEMP} + kube-scp ${minion} "${ROOT}/binaries/node ${ROOT}/node ${ROOT}/config-default.sh ${ROOT}/util.sh" ${KUBE_TEMP} kube-ssh "${minion}" " \ - sudo cp -r ${KUBE_TEMP}/minion/bin /opt/kubernetes; \ + sudo cp -r ${KUBE_TEMP}/node/bin /opt/kubernetes; \ sudo chmod -R +x /opt/kubernetes/bin; \ - sudo bash ${KUBE_TEMP}/minion/scripts/flannel.sh ${ETCD_SERVERS} ${FLANNEL_NET}; \ - sudo bash ${KUBE_TEMP}/minion/scripts/docker.sh \"${DOCKER_OPTS}\"; \ - sudo bash ${KUBE_TEMP}/minion/scripts/kubelet.sh ${master_ip} ${minion_ip}; \ - sudo bash ${KUBE_TEMP}/minion/scripts/proxy.sh ${master_ip}" + sudo bash ${KUBE_TEMP}/node/scripts/flannel.sh ${ETCD_SERVERS} ${FLANNEL_NET}; \ + sudo bash ${KUBE_TEMP}/node/scripts/docker.sh \"${DOCKER_OPTS}\"; \ + sudo bash ${KUBE_TEMP}/node/scripts/kubelet.sh ${master_ip} ${minion_ip}; \ + sudo bash ${KUBE_TEMP}/node/scripts/proxy.sh ${master_ip}" } # Create dirs that'll be used during setup on target machine.