diff --git a/cluster/gce/trusty/helper.sh b/cluster/gce/trusty/helper.sh index 6ad5f79c727..09aa4b12dc8 100644 --- a/cluster/gce/trusty/helper.sh +++ b/cluster/gce/trusty/helper.sh @@ -22,124 +22,10 @@ # replaced upstart with systemd as the init system. Consequently, the # configuration cannot work on these images. -# $1: if 'true', we're building a master yaml, else a node -function build-kube-env { - local master=$1 - local file=$2 - - rm -f ${file} - # TODO(andyzheng0831): master node is still running with Debian image. Switch it - # to Ubuntu trusty. - if [[ "${master}" == "true" ]]; then - cat >$file <>$file < /etc/kube-env) - # Create the kubelet kubeconfig file. + #Create the kubelet kubeconfig file. . /etc/kube-env if [ -z "${KUBELET_CA_CERT}" ]; then KUBELET_CA_CERT="${CA_CERT}"