github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
78ecb0435b
kubernetes/cluster/gce/gci
History
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
..
configure-helper.sh Merge pull request #32151 from bboreham/fix-cni-on-gci 2016-09-13 16:42:06 -07:00
configure.sh bump cni 2016-09-06 10:48:36 -07:00
health-monitor.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
helper.sh Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and 2016-07-15 12:02:31 -07:00
master-helper.sh Support for creation/removes of master replicas. 2016-08-15 22:36:49 +02:00
master.yaml gci: decouple from the built-in kubelet version 2016-08-24 23:36:08 -07:00
node-helper.sh Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and 2016-07-15 12:02:31 -07:00
node.yaml gci: decouple from the built-in kubelet version 2016-08-24 23:36:08 -07:00
README.md Update Container-VM Image product name in docs 2016-09-09 10:08:56 -07:00

README.md

Container-VM Image

Container-VM Image is a container-optimized OS image for the Google Cloud Platform (GCP). It is primarily for running Google services on GCP. Unlike the open preview version of container-vm, the new Container-VM Image is based on the open source ChromiumOS project, allowing us greater control over the build management, security compliance, and customizations for GCP.

Analytics