mirror of https://github.com/k3s-io/k3s
da3f1a3ea1
Automatic merge from submit-queue (batch tested with PRs 64445, 67459, 67434). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. dockershim/network: pass ipRange CNI capabilities **What this PR does / why we need it**: Updates the dynamic (capability args) passed from Kubernetes to the CNI plugin. This means CNI plugin authors can offer more features and / or reduce their dependency on the APIServer. Currently, we only pass the `portMappings` capability. CNI now supports `bandwidth` for bandwidth limiting and `ipRanges` for preferred IP blocks. This PR adds support for these two new capabilities. Bandwidth limits are provided - as implemented in kubenet - via the pod annotations `kubernetes.io/ingress-bandwidth` and `kubernetes.io/egress-bandwidth`. The ipRanges field simply passes the PodCIDR. This does mean that we need to change the NodeReady algorithm. Previously, we would only set NodeNotReady on missing PodCIDR when using Kubenet. Now, if the CNI configuration includes the `ipRanges` capability, we need to do the same. **Which issue(s) this PR fixes**: Fixes #64393 **Release note**: ```release-note The dockershim now sets the "bandwidth" and "ipRanges" CNI capabilities (dynamic parameters). Plugin authors and administrators can now take advantage of this by updating their CNI configuration file. For more information, see the [CNI docs](https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md#dynamic-plugin-specific-fields-capabilities--runtime-configuration) ``` |
||
|---|---|---|
| .. | ||
| apis | ||
| cadvisor | ||
| certificate | ||
| checkpoint | ||
| checkpointmanager | ||
| client | ||
| cloudresource | ||
| cm | ||
| config | ||
| configmap | ||
| container | ||
| custommetrics | ||
| dockershim | ||
| envvars | ||
| events | ||
| eviction | ||
| images | ||
| kubeletconfig | ||
| kuberuntime | ||
| leaky | ||
| lifecycle | ||
| logs | ||
| metrics | ||
| mountpod | ||
| network | ||
| nodestatus | ||
| pleg | ||
| pod | ||
| preemption | ||
| prober | ||
| qos | ||
| remote | ||
| secret | ||
| server | ||
| stats | ||
| status | ||
| sysctl | ||
| token | ||
| types | ||
| util | ||
| volumemanager | ||
| winstats | ||
| BUILD | ||
| OWNERS | ||
| active_deadline.go | ||
| active_deadline_test.go | ||
| doc.go | ||
| kubelet.go | ||
| kubelet_getters.go | ||
| kubelet_getters_test.go | ||
| kubelet_network.go | ||
| kubelet_network_test.go | ||
| kubelet_node_status.go | ||
| kubelet_node_status_test.go | ||
| kubelet_pods.go | ||
| kubelet_pods_test.go | ||
| kubelet_pods_windows_test.go | ||
| kubelet_resources.go | ||
| kubelet_resources_test.go | ||
| kubelet_test.go | ||
| kubelet_volumes.go | ||
| kubelet_volumes_test.go | ||
| oom_watcher.go | ||
| oom_watcher_test.go | ||
| pod_container_deletor.go | ||
| pod_container_deletor_test.go | ||
| pod_workers.go | ||
| pod_workers_test.go | ||
| reason_cache.go | ||
| reason_cache_test.go | ||
| runonce.go | ||
| runonce_test.go | ||
| runtime.go | ||
| util.go | ||
| volume_host.go | ||