mirror of https://github.com/k3s-io/k3s
da932c19c8
Automatic merge from submit-queue (batch tested with PRs 59394, 58769, 59423, 59363, 59245). 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>. IPv6: Ensure calculated node CIDR size for pod subnets is valid With IPv4, the node CIDR prefix is set to /24, which gives 256 pods per node and 256 nodes, when assuming a /16 is used for the pod subnet. For IPv6, the node CIDR prefix, is hard coded to /64. This does not work, because the pod subnet prefix must be /66 or higher and must be a larger subnet (lower value) than the node CIDR prefix. In addition, the bit mask used to track the subnets (implying the number of nodes), can only handle 32K entries, so the difference between pod subnet prefix and node CIDR prefix cannot be more than 16 (bits). To address this, the following algorithm is proposed to provide as many pods per node as possible, and not exceed the number of nodes. If the pod subnet prefix is from /66 to /104, we'll set the node CIDR prefix to 16 more, so that the bit map is not exceeded. The rest of the bits will be for pods per node. If the subnet prefix is from /105 to /112, we'll split the available bits between what is used for the nodes and what is used for the pods per node. This will give a node CIDR prefix from /116 to /120. If the subnet prefix is from /113 to /119, we'll do like IPv4 and ensure that there are 256 pods per node, and the remaining bits will be for the nodes, giving a node CIDR prefix of /120 always. This supports a limited number of nodes, in some cases. If the subnet prefix is /120 to /128, we don't have enough bits and will set the node CIDR prefix to be the same as the pod subnet prefix. This will cause a falure later, when it tests that the pod subnet prefix is larger than the node CIDR prefi. **What this PR does / why we need it**: **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #58766 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` |
||
|---|---|---|
| .. | ||
| clicheck | ||
| cloud-controller-manager | ||
| controller-manager/app/options | ||
| gendocs | ||
| genkubedocs | ||
| genman | ||
| genswaggertypedocs | ||
| genutils | ||
| genyaml | ||
| gke-certificates-controller | ||
| hyperkube | ||
| importverifier | ||
| kube-apiserver | ||
| kube-controller-manager | ||
| kube-proxy | ||
| kube-scheduler | ||
| kubeadm | ||
| kubectl | ||
| kubelet | ||
| kubemark | ||
| linkcheck | ||
| BUILD | ||
| OWNERS | ||