Skip to content

K
k3s
Commit 0c089dcf authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #15265 from andyzheng0831/trusty

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