mirror of https://github.com/k3s-io/k3s
Merge pull request #65252 from jingax10/script_cleanup_branch
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Remove echo cmd when overwriting a file from an Env var. **What this PR does / why we need it**: Cleanup the shell script. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note "NONE" ```pull/8/head
commit
3e5b902cd9
|
@ -2252,7 +2252,7 @@ function setup-kube-dns-manifest {
|
|||
if [ -n "${CUSTOM_KUBE_DNS_YAML:-}" ]; then
|
||||
# Replace with custom GKE kube-dns deployment.
|
||||
cat > "${kubedns_file}" <<EOF
|
||||
$(echo "$CUSTOM_KUBE_DNS_YAML")
|
||||
$CUSTOM_KUBE_DNS_YAML
|
||||
EOF
|
||||
update-prometheus-to-sd-parameters ${kubedns_file}
|
||||
fi
|
||||
|
@ -2275,7 +2275,7 @@ function setup-netd-manifest {
|
|||
if [ -n "${CUSTOM_NETD_YAML:-}" ]; then
|
||||
# Replace with custom GCP netd deployment.
|
||||
cat > "${netd_file}" <<EOF
|
||||
$(echo "$CUSTOM_NETD_YAML")
|
||||
$CUSTOM_NETD_YAML
|
||||
EOF
|
||||
fi
|
||||
}
|
||||
|
@ -2292,7 +2292,7 @@ function setup-addon-custom-yaml {
|
|||
if [ -n "${custom_yaml:-}" ]; then
|
||||
# Replace with custom manifest.
|
||||
cat > "${manifest_path}" <<EOF
|
||||
$custom_yaml
|
||||
$custom_yaml
|
||||
EOF
|
||||
fi
|
||||
}
|
||||
|
@ -2323,7 +2323,7 @@ function start-kube-addons {
|
|||
if [ -n "${CUSTOM_KUBE_PROXY_YAML:-}" ]; then
|
||||
# Replace with custom GKE kube proxy.
|
||||
cat > "$src_dir/kube-proxy/kube-proxy-ds.yaml" <<EOF
|
||||
$(echo "$CUSTOM_KUBE_PROXY_YAML")
|
||||
$CUSTOM_KUBE_PROXY_YAML
|
||||
EOF
|
||||
update-prometheus-to-sd-parameters "$src_dir/kube-proxy/kube-proxy-ds.yaml"
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue