Merge pull request #47894 from xuxinkun/fixclustercentos20170622

Automatic merge from submit-queue (batch tested with PRs 48092, 47894, 47983) fix systemd service file for custom args. `KUBE_SCHEDULER_ARGS` and `KUBELET_ARGS` are used to custom args for scheduler or kubelet by users. But if there are more than one params in `KUBELET_ARGS`, for example, if I set KUBELET_ARGS="--cgroups-per-qos=false --enforce-node-allocatable=", the kubelet will judge the `false --enforce-node-allocatable=` as the value of `cgroups-per-qos`. Because `${KUBELET_ARGS}` in kubelet.service will expands the variable into one word. And if I take `$KUBELET_ARGS` instead, kubelet will worker perfectly. For more info, please click [EnvironmentFiles and support for /etc/sysconfig files](http://fedoraproject.org/wiki/Packaging:Systemd#EnvironmentFiles_and_support_for_.2Fetc.2Fsysconfig_files). This bug is reported by @huanxingyouyoutoo. And I make this PR for her to fix it. **Release note**: ``` NONE ```

Merge pull request #47894 from xuxinkun/fixclustercentos20170622
e8701e67 · Kubernetes Submit Queue · GitHub · eb2c702a · a3e3f53f · e8701e67
Commit e8701e67 authored Jun 26, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 26, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

scheduler.sh cluster/centos/master/scripts/scheduler.sh +1 -1

kubelet.sh cluster/centos/node/scripts/kubelet.sh +1 -1

No files found.
--- a/cluster/centos/master/scripts/scheduler.sh
+++ b/cluster/centos/master/scripts/scheduler.sh
@@ -41,7 +41,7 @@ KUBE_SCHEDULER_OPTS="   \${KUBE_LOGTOSTDERR}     \\
                        \${KUBE_LOG_LEVEL}       \\
                        \${KUBE_MASTER}          \\
                        \${KUBE_LEADER_ELECT}    \\
-                        \${KUBE_SCHEDULER_ARGS}"
+                        \$KUBE_SCHEDULER_ARGS"
 cat <<EOF >/usr/lib/systemd/system/kube-scheduler.service
 [Unit]

--- a/cluster/centos/node/scripts/kubelet.sh
+++ b/cluster/centos/node/scripts/kubelet.sh
@@ -61,7 +61,7 @@ KUBE_PROXY_OPTS="   \${KUBE_LOGTOSTDERR}     \\
                    \${KUBE_ALLOW_PRIV}      \\
                    \${KUBELET__DNS_IP}      \\
                    \${KUBELET_DNS_DOMAIN}      \\
-                    \${KUBELET_ARGS}"
+                    \$KUBELET_ARGS"
 cat <<EOF >/usr/lib/systemd/system/kubelet.service
 [Unit]