kubernetes/cmd
Kubernetes Submit Queue c4893df894 Merge pull request #32151 from bboreham/fix-cni-on-gci
Automatic merge from submit-queue

Add flag to set CNI bin dir, and use it on gci nodes

**What this PR does / why we need it**:

When using `kube-up` on GCE, following #31023 which moved the workers from debian to gci, CNI just isn't working.  The root cause is basically as discussed in #28563: one flag (`--network-plugin-dir`) means two different things, and the `configure-helper` script uses it for the wrong purpose.

This PR adds a new flag `--cni-bin-dir`, then uses it to configure CNI as desired.

As discussed at #28563, I have also added a flag `--cni-conf-dir` so users can be explicit 

**Which issue this PR fixes** : fixes #28563

**Special notes for your reviewer**:

I left the old flag largely alone for backwards-compatibility, with the exception that I stop setting the default when CNI is in use.  The value of `"/usr/libexec/kubernetes/kubelet-plugins/net/exec/"` is unlikely to be what is wanted there.

**Release note**:
```release-note
Added new kubelet flags `--cni-bin-dir` and `--cni-conf-dir` to specify where CNI files are located.
Fixed CNI configuration on GCI platform when using CNI.
```
2016-09-13 16:42:06 -07:00
..
gendocs Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
genkubedocs Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
genman Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
genswaggertypedocs Remove GOMAXPROCS() calls because they are unnecessary 2016-07-19 11:08:21 +03:00
genutils Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
genyaml Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
hyperkube Split the version metric out to its own package 2016-08-24 11:47:16 -07:00
kube-apiserver Revert "Remove deprecated Namespace admission plug-ins" 2016-08-28 10:20:44 -07:00
kube-controller-manager Merge pull request #30825 from wongma7/pv-controller-informer 2016-09-10 12:40:30 -07:00
kube-dns Support graceful termination in kube-dns 2016-09-01 12:54:33 -07:00
kube-proxy delete null value 2016-09-07 08:27:17 +08:00
kubectl Split the version metric out to its own package 2016-08-24 11:47:16 -07:00
kubelet Merge pull request #32151 from bboreham/fix-cni-on-gci 2016-09-13 16:42:06 -07:00
kubemark Split the version metric out to its own package 2016-08-24 11:47:16 -07:00
kubernetes-discovery etcd3 validation showed that several unit tests that depend on apiserver being fully 2016-08-18 14:12:24 -05:00
libs/go2idl Merge pull request #31468 from mbohlool/master 2016-09-13 01:56:23 -07:00
linkcheck Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
mungedocs Update the latestReleaseBranch to release-1.4 in the munger. 2016-09-01 14:40:55 -07:00
OWNERS Remove myself from a bunch of OWNERS files, as I am too overloaded 2016-05-11 13:34:51 -07:00