Commit 0c089dcf authored by k8s-merge-robot's avatar k8s-merge-robot

Merge pull request #15265 from andyzheng0831/trusty

Auto commit by PR queue bot
parents 27ff98c8 3a5f3f06
......@@ -244,7 +244,6 @@ script
set -o errexit
set -o nounset
# TODO(andyzheng0831): Add health check functionality.
. /etc/kube-env
ARGS="--v=2"
if [ -n "${KUBELET_TEST_ARGS:-}" ]; then
......@@ -259,7 +258,7 @@ script
--enable-debugging-handlers=true \
--cloud-provider=gce \
--config=/etc/kubernetes/manifests \
--allow-privileged=false \
--allow-privileged=true \
--cluster-dns=${DNS_SERVER_IP} \
--cluster-domain=${DNS_DOMAIN} \
--configure-cbr0=true \
......
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