github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove echo cmd when overwriting a file from an Env var.

pull/8/head
Jing Ai 2018-07-03 23:28:47 -07:00
parent e3fa9133af
commit efee982582
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/gce/gci/configure-helper.sh
View File

@ -2252,7 +2252,7 @@ function setup-kube-dns-manifest {
if [ -n "${CUSTOM_KUBE_DNS_YAML:-}" ]; then if [ -n "${CUSTOM_KUBE_DNS_YAML:-}" ]; then
# Replace with custom GKE kube-dns deployment. # Replace with custom GKE kube-dns deployment.
cat > "${kubedns_file}" <<EOF cat > "${kubedns_file}" <<EOF
$(echo "$CUSTOM_KUBE_DNS_YAML") $CUSTOM_KUBE_DNS_YAML
EOF EOF
update-prometheus-to-sd-parameters ${kubedns_file} update-prometheus-to-sd-parameters ${kubedns_file}
fi fi
@ -2275,7 +2275,7 @@ function setup-netd-manifest {
if [ -n "${CUSTOM_NETD_YAML:-}" ]; then if [ -n "${CUSTOM_NETD_YAML:-}" ]; then
# Replace with custom GCP netd deployment. # Replace with custom GCP netd deployment.
cat > "${netd_file}" <<EOF cat > "${netd_file}" <<EOF
$(echo "$CUSTOM_NETD_YAML") $CUSTOM_NETD_YAML
EOF EOF
fi fi
} }
@ -2323,7 +2323,7 @@ function start-kube-addons {
if [ -n "${CUSTOM_KUBE_PROXY_YAML:-}" ]; then if [ -n "${CUSTOM_KUBE_PROXY_YAML:-}" ]; then
# Replace with custom GKE kube proxy. # Replace with custom GKE kube proxy.
cat > "$src_dir/kube-proxy/kube-proxy-ds.yaml" <<EOF cat > "$src_dir/kube-proxy/kube-proxy-ds.yaml" <<EOF
$(echo "$CUSTOM_KUBE_PROXY_YAML") $CUSTOM_KUBE_PROXY_YAML
EOF EOF
update-prometheus-to-sd-parameters "$src_dir/kube-proxy/kube-proxy-ds.yaml" update-prometheus-to-sd-parameters "$src_dir/kube-proxy/kube-proxy-ds.yaml"
fi fi