github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #25348 from gmarek/cidr 

Automatic merge from submit-queue

Make Kubemark assign cluster CIDRs
pull/6/head
k8s-merge-robot 2016-05-09 07:32:36 -07:00
parent bd2b41ca67 7981f479de
commit 4642621baf
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/kubemark/start-kubemark-master.sh
View File

@ -58,4 +58,10 @@ kubernetes/server/bin/kube-apiserver \
until [ "$(curl 127.0.0.1:8080/healthz 2> /dev/null)" == "ok" ]; do
sleep 1
done
kubernetes/server/bin/kube-controller-manager --master=127.0.0.1:8080 --service-account-private-key-file=/srv/kubernetes/server.key --root-ca-file=/srv/kubernetes/ca.crt --v=2 &> /var/log/kube-controller-manager.log &
kubernetes/server/bin/kube-controller-manager \
--master=127.0.0.1:8080 \
--service-account-private-key-file=/srv/kubernetes/server.key \
--root-ca-file=/srv/kubernetes/ca.crt \
--v=2 \
--allocate-node-cidrs=true \
--cluster-cidr=10.180.0.0/13 &> /var/log/kube-controller-manager.log &