github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bunch of places where the -machines flag was still attached to the apiserver.

Browse Source
This commit is contained in:
Brendan Burns
2014-11-01 20:38:45 -07:00
parent bbb66af3db
commit 8d34231381
17 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/getting-started-guides/coreos/configs/master.yml
View File

@@ -119,7 +119,6 @@ coreos:
--address=127.0.0.1 \
--port=8080 \
--etcd_servers=http://127.0.0.1:4001 \
--machines=192.168.12.10,192.168.12.11,192.168.12.12 \
--logtostderr=true
Restart=always
RestartSec=10
@@ -161,6 +160,7 @@ coreos:
[Service]
ExecStart=/opt/bin/controller-manager \
--master=127.0.0.1:8080 \
--machines=192.168.12.10,192.168.12.11,192.168.12.12 \
--logtostderr=true
Restart=always
RestartSec=10

2
docs/getting-started-guides/coreos/configs/standalone.yml
View File

@@ -48,7 +48,6 @@ coreos:
--address=127.0.0.1 \
--port=8080 \
--etcd_servers=http://127.0.0.1:4001 \
--machines=127.0.0.1 \
--logtostderr=true
Restart=on-failure
RestartSec=1
@@ -86,6 +85,7 @@ coreos:
[Service]
ExecStart=/opt/bin/controller-manager \
--master=127.0.0.1:8080 \
--machines=127.0.0.1 \
--logtostderr=true
Restart=on-failure
RestartSec=1

1
docs/getting-started-guides/coreos/units/apiserver.service
View File

@@ -8,7 +8,6 @@ ExecStart=/opt/bin/apiserver \
--address=127.0.0.1 \
--port=8080 \
--etcd_servers=http://127.0.0.1:4001 \
--machines=127.0.0.1 \
--portal_net=10.0.0.0/24 \
--logtostderr=true
Restart=on-failure

1
docs/getting-started-guides/coreos/units/controller-manager.service
View File

@@ -6,6 +6,7 @@ Documentation=https://github.com/GoogleCloudPlatform/kubernetes
[Service]
ExecStart=/opt/bin/controller-manager \
--master=127.0.0.1:8080 \
--machines=127.0.0.1 \
--etcd_servers=http://127.0.0.1:4001 \
--logtostderr=true
Restart=on-failure

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

@@ -102,9 +102,6 @@ KUBE_API_PORT="--port=8080"
# How the replication controller and scheduler find the apiserver
KUBE_MASTER="--master=fed-master:8080"
# Comma seperated list of minions
KUBELET_ADDRESSES="--machines=fed-minion"
# Port minions listen on
KUBELET_PORT="--kubelet_port=10250"
@@ -115,6 +112,18 @@ KUBE_SERVICE_ADDRESSES="--portal_net=10.254.0.0/16"
KUBE_API_ARGS=""
```
* Edit /etc/kubernetes/controller-manager to appear as such:
```
###
# kubernetes system config
#
# The following values are used to configure the kubernetes-controller-manager
#
# Comma seperated list of minions
KUBELET_ADDRESSES="--machines=fed-minion"
```
* Start the appropriate services on master:
```