Skip to content

K
k3s
Commit 4642621b authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #25348 from gmarek/cidr

Automatic merge from submit-queue Make Kubemark assign cluster CIDRs
parents bd2b41ca 7981f479
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
test/kubemark/start-kubemark-master.sh
View file @ 4642621b
......@@ -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 &
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment