Kubernetes Submit Queue 4f50a8d7cd Merge pull request #44457 from dnardo/e2e_node_cni ... Automatic merge from submit-queue (batch tested with PRs 43000, 44500, 44457, 44553, 44267) Updates e2e_node test to allow both kubenet and cni to be specified f… …or the network plugin. This adds a simple CNI configuration which is added to the node during test setup. This also modifies the default flags in services/kubelet.go to specify the "cni-bin-dir" and the "cni-conf-dir" and removes the "network-plugin-dir" flag. This leaves the default network plugin to kubenet. **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note ```		2017-04-18 13:19:08 -07:00
..
BUILD	autogenerated	2017-04-14 10:40:57 -07:00
apiserver.go	wire in aggregation	2017-03-27 09:44:10 -04:00
etcd.go	Remove leagcy init that no longer works.	2017-04-11 08:48:59 -05:00
internal_services.go	Add run kubelet mode.	2016-12-13 19:08:55 -08:00
kubelet.go	Updates e2e_node test to allow both kubenet and cni to be specified for the network plugin.	2017-04-13 09:57:46 -07:00
namespace_controller.go	Switch namespace controller to shared informer	2017-02-17 12:34:27 -05:00
server.go	Remove sudo in test suite and run test with sudo.	2016-11-07 15:27:53 -08:00
services.go	pkg/flag: make feature gate extensible and split between generic and kube	2017-01-24 20:56:03 +01:00
util.go	Add run kubelet mode.	2016-12-13 19:08:55 -08:00