Merge pull request #38193 from wojtek-t/collect_controller_manager_logs_from_kubemark

Automatic merge from submit-queue (batch tested with PRs 38276, 38193) Collect controller-manager logs from kubemark

Merge pull request #38193 from wojtek-t/collect_controller_manager_logs_from_kubemark
412bed18 · Kubernetes Submit Queue · GitHub · 66247279 · aab227dd · 412bed18
Commit 412bed18 authored Dec 07, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 07, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

start-kubemark-master.sh test/kubemark/start-kubemark-master.sh +1 -1

No files found.
--- a/test/kubemark/start-kubemark-master.sh
+++ b/test/kubemark/start-kubemark-master.sh
@@ -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 \