mirror of
https://github.com/kubernetes/kubernetes.git
synced 2026-02-26 03:30:39 -05:00
4f50a8d7cd
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 ``` |
||
|---|---|---|
| .. | ||
| BUILD | ||
| node_conformance.go | ||
| node_e2e.go | ||
| remote.go | ||
| ssh.go | ||
| types.go | ||
| utils.go | ||