From fbff5fd084e1a2ec9e8d3e9fff1f3285c229ef7d Mon Sep 17 00:00:00 2001 From: "zuoxiu.jm" <291271447@qq.com> Date: Sat, 22 Sep 2018 11:25:56 +0800 Subject: [PATCH] fixes bsd / gnu sed --- hack/local-up-cluster.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh index bcf988bdc10..35a41dc9626 100755 --- a/hack/local-up-cluster.sh +++ b/hack/local-up-cluster.sh @@ -141,6 +141,7 @@ fi set -e source "${KUBE_ROOT}/hack/lib/init.sh" +kube::util::ensure-gnu-sed function usage { echo "This script starts a local kube cluster. " @@ -861,7 +862,7 @@ EOF # foo: true # bar: false for gate in $(echo ${FEATURE_GATES} | tr ',' ' '); do - echo $gate | sed -e 's/\(.*\)=\(.*\)/ \1: \2/' + echo $gate | ${SED} -e 's/\(.*\)=\(.*\)/ \1: \2/' done fi >>/tmp/kube-proxy.yaml @@ -884,9 +885,8 @@ EOF function start_kubedns { if [[ "${ENABLE_CLUSTER_DNS}" = true ]]; then cp "${KUBE_ROOT}/cluster/addons/dns/kube-dns/kube-dns.yaml.in" kube-dns.yaml - sed -i -e "s/{{ pillar\['dns_domain'\] }}/${DNS_DOMAIN}/g" kube-dns.yaml - sed -i -e "s/{{ pillar\['dns_server'\] }}/${DNS_SERVER_IP}/g" kube-dns.yaml - + ${SED} -i -e "s/{{ pillar\['dns_domain'\] }}/${DNS_DOMAIN}/g" kube-dns.yaml + ${SED} -i -e "s/{{ pillar\['dns_server'\] }}/${DNS_SERVER_IP}/g" kube-dns.yaml # TODO update to dns role once we have one. # use kubectl to create kubedns addon ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f kube-dns.yaml