github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 06:32:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8785 from aveshagarwal/kubernetes-fixes

Browse Source 
Updating systemd service and environ files for controller-manager as --machines is deprecated.
This commit is contained in:
Saad Ali
2015-05-26 18:52:25 -07:00
parent 8e25670c07 f9d8212ff9
commit 441b690204
3 changed files with 0 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/init/systemd/environ/controller-manager
View File

@@ -3,8 +3,5 @@
# defaults from config and apiserver should be adequate
# Comma separated list of minions
KUBELET_ADDRESSES="--machines=127.0.0.1"
# Add your own!
KUBE_CONTROLLER_MANAGER_ARGS=""

1
contrib/init/systemd/kube-controller-manager.service
View File

@@ -9,7 +9,6 @@ User=kube
ExecStart=/usr/bin/kube-controller-manager \
$KUBE_LOGTOSTDERR \
$KUBE_LOG_LEVEL \
$KUBELET_ADDRESSES \
$KUBE_MASTER \
$KUBE_CONTROLLER_MANAGER_ARGS
Restart=on-failure