github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +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
commit 441b690204
3 changed files with 0 additions and 13 deletions
Show Stats 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

9
docs/getting-started-guides/fedora/fedora_manual_config.md
View File

@ -77,15 +77,6 @@ KUBE_SERVICE_ADDRESSES="--portal_net=10.254.0.0/16"
KUBE_API_ARGS=""
```
* *Optional* Edit /etc/kubernetes/controller-manager and remove --machines=127.0.0.1 from the KUBELET_ADDRESSES. Leaving this in won't hurt anything but it will cause the output to note that the 127.0.0.1 node is NotReady because we will not be configuring one in this guide.
```
KUBELET_ADDRESSES=""
KUBE_CONTROLLER_MANAGER_ARGS=""
```
* Edit /etc/etcd/etcd.conf,let the etcd to listen all the ip instead of 127.0.0.1, if not, you will get the error like "connection refused"
```
ETCD_LISTEN_CLIENT_URLS="http://0.0.0.0:4001"