github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-13 21:25:09 +00:00
Code Issues 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

4
cluster/rackspace/cloud-config/master-cloud-config.yaml
View File

@@ -77,7 +77,7 @@ coreos:
[Service]
EnvironmentFile=-/run/apiserver/minions.env
ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/apiserver /opt/bin/apiserver
ExecStart=/opt/bin/apiserver --address=127.0.0.1 --port=8080 --machines=${MINIONS} --etcd_servers=http://127.0.0.1:4001 --portal_net=PORTAL_NET --logtostderr=true
ExecStart=/opt/bin/apiserver --address=127.0.0.1 --port=8080 --etcd_servers=http://127.0.0.1:4001 --portal_net=PORTAL_NET --logtostderr=true
Restart=always
RestartSec=2
- name: master-apiserver-sighup.path
@@ -116,7 +116,7 @@ coreos:
Requires=master-apiserver.service
[Service]
ExecStartPre=/usr/bin/ln -sf /opt/kubernetes/server/bin/controller-manager /opt/bin/controller-manager
ExecStart=/opt/bin/controller-manager --master=127.0.0.1:8080 --logtostderr=true
ExecStart=/opt/bin/controller-manager --master=127.0.0.1:8080 --machines=${MINIONS} --logtostderr=true
Restart=always
RestartSec=2
- name: master-scheduler.service