mark --network-plugin-dir deprecated for kubelet, and update related bootstrap scripts

2017-05-24 14:34:13 +08:00
parent b7f52a8c2e
commit dc9f0f9729
7 changed files with 28 additions and 22 deletions
--- a/hack/make-rules/test-e2e-node.sh
+++ b/hack/make-rules/test-e2e-node.sh
@@ -148,7 +148,7 @@ else

  # Do not use any network plugin by default. User could override the flags with
  # test_args.
-  test_args='--kubelet-flags="--network-plugin= --network-plugin-dir=" '$test_args
+  test_args='--kubelet-flags="--network-plugin= --cni-bin-dir=" '$test_args

  # Runtime flags
  test_args='--kubelet-flags="--container-runtime='$runtime'" '$test_args