Fixed IPv4 podCIDR check in case spec.PodCIDR is IPv6 #1672
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Roberto Bonafiglia <[email protected]>
rbrtbnfgl
force-pushed
the
fixpodCIDR
branch
from
3ce665a to
70c6f43
Compare
manuelbuil
requested changes
Nov 10, 2022
subnet/kube/kube.go
Outdated
|
|
||
| for _, podCidr := range n.Spec.PodCIDRs { | ||
| _, parseCidr, err := net.ParseCIDR(podCidr) | ||
| if len(n.Spec.PodCIDRs) == 0 { |
There was a problem hiding this comment.
What about adding a switch:
switch len(n.Spec.PodCIDRs) {
case 0:
// do stuff with n.Spec.PodCIDR
case len(n.Spec.PodCIDRs) < 3:
// do stuff with n.Spec.PodCIDRs
default:
// fail!
That way we are protected of weird cases
subnet/kube/kube.go
Outdated
| _, cidr, err := net.ParseCIDR(n.Spec.PodCIDR) | ||
| if err != nil { | ||
| return l, err | ||
| cidr := new(net.IPNet) |
There was a problem hiding this comment.
I think it is cleaner to define it as it was in line 296
subnet/kube/kube.go
Outdated
| if err != nil { | ||
| return l, err | ||
| cidr := new(net.IPNet) | ||
| if len(n.Spec.PodCIDRs) == 0 { |
There was a problem hiding this comment.
Same here with the switch
| return l, err | ||
| cidr := new(net.IPNet) | ||
| if len(n.Spec.PodCIDRs) == 0 { | ||
| _, cidr, err = net.ParseCIDR(n.Spec.PodCIDR) |
There was a problem hiding this comment.
Don't you need to check if this is ipv6 or ipv4?
There was a problem hiding this comment.
No because if IPv4 is enabled and no IPv4 CIDR is specified on the pod subnet Flannel should throw an error before the subnet manager starts.
| return l, err | ||
| } | ||
| } else { | ||
| log.Infof("Creating the node lease for IPv4. This is the n.Spec.PodCIDRs: %v", n.Spec.PodCIDRs) |
There was a problem hiding this comment.
This log will only be correct if len =1, right?
Signed-off-by: Roberto Bonafiglia <[email protected]>
rbrtbnfgl
force-pushed
the
fixpodCIDR
branch
from
70c6f43 to
c2d1dab
Compare
manuelbuil
approved these changes
Nov 16, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
When using kubeadm if the podSubnet is dualstack and specified as IPv6,IPv4 spec.PodCIDR of the node will be the IPv6 and Flannel will fail to check the IPv4 CIDR. (#1629).
This PR will remove the check of spec.PodCIDR to always check spec.PodCIDRs for both IPv4 and IPv6.
Todos
Release Note