mirror of https://github.com/k3s-io/k3s
Merge pull request #62807 from rpothier/kubeadm-cidr
Automatic merge from submit-queue (batch tested with PRs 63735, 62807). 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>. Kubeadm: Update comments and UT to remove /66 restriction **What this PR does / why we need it**: The comments in cmd/kubeadm/app/phases/controlplane/manifests.go mention the IPv6 /66 restriction, and the UT also refers to this. This restriction was removed in PR#60089 This removes those comments and updates the UT **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 #62806 **Special notes for your reviewer**: **Release note**: ```release-note-none ```pull/8/head
commit
f5a91f4173
|
@ -275,9 +275,6 @@ func getAPIServerCommand(cfg *kubeadmapi.MasterConfiguration) []string {
|
|||
// If the pod network size is /113 or larger, the node CIDR will be set to the same
|
||||
// size and this will be rejected later in validation.
|
||||
//
|
||||
// NOTE: Currently, the pod network must be /66 or larger. It is not reflected here,
|
||||
// but a smaller value will fail later validation.
|
||||
//
|
||||
// NOTE: Currently, the design allows a maximum of 64K nodes. This algorithm splits
|
||||
// the available bits to maximize the number used for nodes, but still have the node
|
||||
// CIDR be a multiple of eight.
|
||||
|
|
|
@ -822,16 +822,21 @@ func TestCalcNodeCidrSize(t *testing.T) {
|
|||
podSubnet: "2001:db8::/95",
|
||||
expectedPrefix: "104",
|
||||
},
|
||||
{
|
||||
name: "V6: Largest subnet currently supported",
|
||||
podSubnet: "2001:db8::/66",
|
||||
expectedPrefix: "80",
|
||||
},
|
||||
{
|
||||
name: "V6: For /64 pod net, use /80",
|
||||
podSubnet: "2001:db8::/64",
|
||||
expectedPrefix: "80",
|
||||
},
|
||||
{
|
||||
name: "V6: For /48 pod net, use /64",
|
||||
podSubnet: "2001:db8::/48",
|
||||
expectedPrefix: "64",
|
||||
},
|
||||
{
|
||||
name: "V6: For /32 pod net, use /48",
|
||||
podSubnet: "2001:db8::/32",
|
||||
expectedPrefix: "48",
|
||||
},
|
||||
}
|
||||
for _, test := range tests {
|
||||
actualPrefix := calcNodeCidrSize(test.podSubnet)
|
||||
|
|
Loading…
Reference in New Issue