From a6cad6379427241b4705d41cf0e991003c4d726f Mon Sep 17 00:00:00 2001
From: Random-Liu <taotaotheripper@gmail.com>
Date: Tue, 19 Jul 2016 02:13:10 -0700
Subject: [PATCH] Add document for node e2e --disable-kubenet flag.

---
 docs/devel/e2e-node-tests.md     | 20 ++++++++++++++++++++
 hack/make-rules/test-e2e-node.sh |  9 +++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/docs/devel/e2e-node-tests.md b/docs/devel/e2e-node-tests.md
index 6ba390ed90e..a96681b77e6 100644
--- a/docs/devel/e2e-node-tests.md
+++ b/docs/devel/e2e-node-tests.md
@@ -205,6 +205,26 @@ less useful for catching flakes related creating the instance from an image.**
 make test-e2e-node REMOTE=true RUN_UNTIL_FAILURE=true
 ```
 
+## Run tests with kubenet network plugin
+
+[kubenet](http://kubernetes.io/docs/admin/network-plugins/#kubenet) is
+the default network plugin used by kubelet since Kubernetes 1.3.  The
+plugin requires [CNI](https://github.com/containernetworking/cni) and
+[nsenter](http://man7.org/linux/man-pages/man1/nsenter.1.html).
+
+Currently, kubenet is enabled by default for Remote execution `REMOTE=true`,
+but disabled for Local execution.  **Note: kubenet is not supported for
+local execution currently. This may cause network related test result to be
+different for Local and Remote execution. So if you want to run network
+related test, Remote execution is recommended.**
+
+To enable/disable kubenet:
+
+```sh
+make test_e2e_node TEST_ARGS="--disable-kubenet=true" # enable kubenet
+make test_e2e_node TEST_ARGS="--disable-kubenet=false" # disable kubenet
+```
+
 ## Additional QoS Cgroups Hierarchy level testing
 
 For testing with the QoS Cgroup Hierarchy enabled, you can pass --cgroups-per-qos flag as an argument into Ginkgo using TEST_ARGS
diff --git a/hack/make-rules/test-e2e-node.sh b/hack/make-rules/test-e2e-node.sh
index fcf39672cc6..0640f6033ac 100755
--- a/hack/make-rules/test-e2e-node.sh
+++ b/hack/make-rules/test-e2e-node.sh
@@ -127,10 +127,15 @@ else
     sudo -v || exit 1
   fi
 
+  # If the flag --disable-kubenet is not set, set true by default.
+  if ! [[ $test_args =~ "--disable-kubenet" ]]; then
+    test_args="$test_args --disable-kubenet=true"
+  fi
   # Test using the host the script was run on
   # Provided for backwards compatibility
+  set -x
   "${ginkgo}" --focus=$focus --skip=$skip "${KUBE_ROOT}/test/e2e_node/" --report-dir=${report} \
-    -- --alsologtostderr --v 2 --node-name $(hostname) --disable-kubenet=true --build-services=true \
-    --start-services=true --stop-services=true "$test_args"
+    -- --alsologtostderr --v 2 --node-name $(hostname) --build-services=false \
+    --start-services=true --stop-services=true $test_args
   exit $?
 fi