github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #38193 from wojtek-t/collect_controller_manager_logs_from_kubemark

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 38276, 38193)

Collect controller-manager logs from kubemark
This commit is contained in:
Kubernetes Submit Queue 2016-12-07 03:54:25 -08:00 committed by GitHub
commit 412bed18fe
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,7 +141,7 @@ write_supervisor_conf "kube-apiserver" "${ulimit_command} /kubernetes/server/bin
--basic-auth-file=/srv/kubernetes/basic_auth.csv \
--target-ram-mb=$((${NUM_NODES} * 60)) \
$(cat /apiserver_flags | tr '\n' ' ')\""
write_supervisor_conf "kube-contoller-manager" "${ulimit_command} /kubernetes/server/bin/kube-controller-manager \
write_supervisor_conf "kube-controller-manager" "${ulimit_command} /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 \