Merge pull request #2524 from avoidik/systemd_user_kubelet

Set exact user for Kubelet services
This commit is contained in:
Andreas Krüger 2018-03-27 16:41:10 +02:00 committed by GitHub
commit 2ca7087018
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 0 deletions

View file

@ -5,6 +5,7 @@ After=docker.service
Wants=docker.socket Wants=docker.socket
[Service] [Service]
User=root
EnvironmentFile={{kube_config_dir}}/kubelet.env EnvironmentFile={{kube_config_dir}}/kubelet.env
ExecStart={{ bin_dir }}/kubelet \ ExecStart={{ bin_dir }}/kubelet \
$KUBE_LOGTOSTDERR \ $KUBE_LOGTOSTDERR \

View file

@ -5,6 +5,7 @@ After=docker.service
Wants=docker.socket Wants=docker.socket
[Service] [Service]
User=root
EnvironmentFile=-{{kube_config_dir}}/kubelet.env EnvironmentFile=-{{kube_config_dir}}/kubelet.env
{% if kubelet_flexvolumes_plugins_dir is defined %} {% if kubelet_flexvolumes_plugins_dir is defined %}
ExecStartPre=-/bin/mkdir -p {{ kubelet_flexvolumes_plugins_dir }} ExecStartPre=-/bin/mkdir -p {{ kubelet_flexvolumes_plugins_dir }}

View file

@ -4,6 +4,7 @@ Documentation=https://github.com/GoogleCloudPlatform/kubernetes
Wants=network.target Wants=network.target
[Service] [Service]
User=root
Restart=on-failure Restart=on-failure
RestartSec=10s RestartSec=10s
TimeoutStartSec=0 TimeoutStartSec=0