github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes bsd / gnu sed

Browse Source
This commit is contained in:
zuoxiu.jm
2018-09-22 11:25:56 +08:00
parent 36877dafe4
commit fbff5fd084
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
hack/local-up-cluster.sh
View File

@@ -141,6 +141,7 @@ fi
set -e set -e
source "${KUBE_ROOT}/hack/lib/init.sh" source "${KUBE_ROOT}/hack/lib/init.sh"
kube::util::ensure-gnu-sed
function usage { function usage {
echo "This script starts a local kube cluster. " echo "This script starts a local kube cluster. "
@@ -861,7 +862,7 @@ EOF
# foo: true # foo: true
# bar: false # bar: false
for gate in $(echo ${FEATURE_GATES} | tr ',' ' '); do for gate in $(echo ${FEATURE_GATES} | tr ',' ' '); do
echo $gate | sed -e 's/\(.*\)=\(.*\)/ \1: \2/' echo $gate | ${SED} -e 's/\(.*\)=\(.*\)/ \1: \2/'
done done
fi >>/tmp/kube-proxy.yaml fi >>/tmp/kube-proxy.yaml
@@ -884,9 +885,8 @@ EOF
function start_kubedns { function start_kubedns {
if [[ "${ENABLE_CLUSTER_DNS}" = true ]]; then if [[ "${ENABLE_CLUSTER_DNS}" = true ]]; then
cp "${KUBE_ROOT}/cluster/addons/dns/kube-dns/kube-dns.yaml.in" kube-dns.yaml 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_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_server'\] }}/${DNS_SERVER_IP}/g" kube-dns.yaml
# TODO update to dns role once we have one. # TODO update to dns role once we have one.
# use kubectl to create kubedns addon # use kubectl to create kubedns addon
${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f kube-dns.yaml ${KUBECTL} --kubeconfig="${CERT_DIR}/admin.kubeconfig" --namespace=kube-system create -f kube-dns.yaml