• Kubernetes Submit Queue's avatar
    Merge pull request #32151 from bboreham/fix-cni-on-gci · c4893df8
    Kubernetes Submit Queue authored
    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.
    ```
    c4893df8
Name
Last commit
Last update
..
addons Loading commit data...
aws Loading commit data...
azure Loading commit data...
azure-legacy Loading commit data...
centos Loading commit data...
gce Loading commit data...
gke Loading commit data...
images Loading commit data...
juju Loading commit data...
kubemark Loading commit data...
lib Loading commit data...
libvirt-coreos Loading commit data...
local Loading commit data...
mesos/docker Loading commit data...
openstack-heat Loading commit data...
ovirt Loading commit data...
photon-controller Loading commit data...
rackspace Loading commit data...
saltbase Loading commit data...
skeleton Loading commit data...
ubuntu Loading commit data...
vagrant Loading commit data...
vsphere Loading commit data...
OWNERS Loading commit data...
README.md Loading commit data...
common.sh Loading commit data...
get-kube-local.sh Loading commit data...
get-kube.sh Loading commit data...
kube-down.sh Loading commit data...
kube-push.sh Loading commit data...
kube-up.sh Loading commit data...
kube-util.sh Loading commit data...
kubectl.sh Loading commit data...
log-dump.sh Loading commit data...
options.md Loading commit data...
test-e2e.sh Loading commit data...
test-network.sh Loading commit data...
test-smoke.sh Loading commit data...
update-storage-objects.sh Loading commit data...
validate-cluster.sh Loading commit data...