Merge pull request #28516 from Random-Liu/disable-cni-for-local-node-e2e

Automatic merge from submit-queue

Node E2E: Disable kubenet for local node e2e test.

After https://github.com/kubernetes/kubernetes/pull/28196, we must manually setup cni and nsenter in local node to run `make test_e2e_node`, which may not be necessary for local development.

I've tried to move cni downloading logic into `BeforeSuite`, however it is still hard to figure out who should install nsenter, manually installed by every developer? in the `setup_host.sh` script? in `BeforeSuite`?

This PR:
* Added a flag to disable kubenet and disabled kubenet in local test.
* Cleaned up the CNI installation logic a bit.

/cc @yujuhong @freehan 
[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
This commit is contained in:
k8s-merge-robot
2016-07-07 18:52:57 -07:00
committed by GitHub
5 changed files with 26 additions and 13 deletions

View File

@@ -100,6 +100,7 @@ deployment-label-key
deserialization-cache-size
dest-file
disable-filter
disable-kubenet
dns-port
dns-provider
dns-provider-config