From 9bf6bc1817fd63a5373d7fe83b45cc39329fc131 Mon Sep 17 00:00:00 2001 From: Yifan Gu Date: Fri, 13 Nov 2015 13:03:44 -0800 Subject: [PATCH] cluster/gce: Move build-kube-env to util.sh This allows all 3 distros(coreos, debian, trusty) to share the same build-kube-env. --- cluster/gce/coreos/helper.sh | 132 ++--------------------------------- cluster/gce/coreos/node.yaml | 20 ++++-- cluster/gce/debian/helper.sh | 119 ------------------------------- cluster/gce/trusty/helper.sh | 6 +- cluster/gce/util.sh | 131 +++++++++++++++++++++++++++++++++- 5 files changed, 150 insertions(+), 258 deletions(-) diff --git a/cluster/gce/coreos/helper.sh b/cluster/gce/coreos/helper.sh index a6eecb7d673..4e86f16e399 100755 --- a/cluster/gce/coreos/helper.sh +++ b/cluster/gce/coreos/helper.sh @@ -16,134 +16,10 @@ # A library of helper functions and constant for coreos os distro -# $1: if 'true', we're building a master yaml, else a node -function build-kube-env { - local master=$1 - local file=$2 - - build-runtime-config - - rm -f ${file} - # TODO(dawnchen): master node is still running with debian image - if [[ "${master}" == "true" ]]; then - cat >$file <>$file <$file <>$file <>$file <>$file <>$file <>$file <>$file <>$file <>$file <>$file <>$file <>$file <$file <>$file <>$file <>$file <>$file <>$file <>$file <>$file <>$file <>$file <>$file <>$file <>$file <