github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix the nodeSelector key creation mechanism

Browse Source 
Fixes the issue caused when multile ClusterCIDR objects have the same
nodeSelector values, order of the requirements in the nodeSelector is
not preserved when nodeSelector is marshalled and converted to a string.
This commit is contained in:
Sarvesh Rangnekar 2023-01-31 21:13:30 +00:00
parent 9875c1b661
commit c791d69b3e
2 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/controller/nodeipam/ipam/multi_cidr_range_allocator.go
View File

@ -732,8 +732,8 @@ func (r *multiCIDRRangeAllocator) updateCIDRsAllocation(data multiCIDRNodeReserv
// defaultNodeSelector generates a label with defaultClusterCIDRKey as the key and // defaultNodeSelector generates a label with defaultClusterCIDRKey as the key and
// defaultClusterCIDRValue as the value, it is an internal nodeSelector matching all // defaultClusterCIDRValue as the value, it is an internal nodeSelector matching all
// nodes. Only used if no ClusterCIDR selects the node. // nodes. Only used if no ClusterCIDR selects the node.
func defaultNodeSelector() ([]byte, error) { func defaultNodeSelector() *v1.NodeSelector {
nodeSelector := &v1.NodeSelector{ return &v1.NodeSelector{
NodeSelectorTerms: []v1.NodeSelectorTerm{ NodeSelectorTerms: []v1.NodeSelectorTerm{
{ {
MatchExpressions: []v1.NodeSelectorRequirement{ MatchExpressions: []v1.NodeSelectorRequirement{
@ -746,13 +746,6 @@ func defaultNodeSelector() ([]byte, error) {
}, },
}, },
} }
marshalledSelector, err := nodeSelector.Marshal()
if err != nil {
return nil, err
}
return marshalledSelector, nil
} }
// prioritizedCIDRs returns a list of CIDRs to be allocated to the node. // prioritizedCIDRs returns a list of CIDRs to be allocated to the node.
@ -883,7 +876,7 @@ func (r *multiCIDRRangeAllocator) orderedMatchingClusterCIDRs(node *v1.Node, occ
pq := make(PriorityQueue, 0) pq := make(PriorityQueue, 0)
for label, clusterCIDRList := range r.cidrMap { for label, clusterCIDRList := range r.cidrMap {
labelsMatch, matchCnt, err := r.matchCIDRLabels(node, []byte(label)) labelsMatch, matchCnt, err := r.matchCIDRLabels(node, label)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -916,11 +909,11 @@ func (r *multiCIDRRangeAllocator) orderedMatchingClusterCIDRs(node *v1.Node, occ
} }
// Append the catch all CIDR config. // Append the catch all CIDR config.
defaultSelector, err := defaultNodeSelector() defaultSelector, err := v1helper.NodeSelectorAsSelector(defaultNodeSelector())
if err != nil { if err != nil {
return nil, err return nil, err
} }
if clusterCIDRList, ok := r.cidrMap[string(defaultSelector)]; ok { if clusterCIDRList, ok := r.cidrMap[defaultSelector.String()]; ok {
matchingCIDRs = append(matchingCIDRs, clusterCIDRList...) matchingCIDRs = append(matchingCIDRs, clusterCIDRList...)
} }
return matchingCIDRs, nil return matchingCIDRs, nil
@ -928,21 +921,14 @@ func (r *multiCIDRRangeAllocator) orderedMatchingClusterCIDRs(node *v1.Node, occ
// matchCIDRLabels Matches the Node labels to CIDR Configs. // matchCIDRLabels Matches the Node labels to CIDR Configs.
// Returns true only if all the labels match, also returns the count of matching labels. // Returns true only if all the labels match, also returns the count of matching labels.
func (r *multiCIDRRangeAllocator) matchCIDRLabels(node *v1.Node, label []byte) (bool, int, error) { func (r *multiCIDRRangeAllocator) matchCIDRLabels(node *v1.Node, label string) (bool, int, error) {
var labelSet labels.Set var labelSet labels.Set
var matchCnt int var matchCnt int
labelsMatch := false labelsMatch := false
selector := &v1.NodeSelector{}
err := selector.Unmarshal(label)
if err != nil {
klog.Errorf("Unable to unmarshal node selector for label %v: %v", label, err)
return labelsMatch, 0, err
}
ls, err := v1helper.NodeSelectorAsSelector(selector) ls, err := labels.Parse(label)
if err != nil { if err != nil {
klog.Errorf("Unable to convert NodeSelector to labels.Selector: %v", err) klog.Errorf("Unable to parse label %s to labels.Selector: %v", label, err)
return labelsMatch, 0, err return labelsMatch, 0, err
} }
reqs, selectable := ls.Requirements() reqs, selectable := ls.Requirements()
@ -959,7 +945,7 @@ func (r *multiCIDRRangeAllocator) matchCIDRLabels(node *v1.Node, label []byte) (
labelsMatch = true labelsMatch = true
} }
} }
return labelsMatch, matchCnt, err return labelsMatch, matchCnt, nil
} }
// Methods for handling ClusterCIDRs. // Methods for handling ClusterCIDRs.
@ -1234,20 +1220,20 @@ func (r *multiCIDRRangeAllocator) deleteClusterCIDR(clusterCIDR *networkingv1alp
} }
func (r *multiCIDRRangeAllocator) nodeSelectorKey(clusterCIDR *networkingv1alpha1.ClusterCIDR) (string, error) { func (r *multiCIDRRangeAllocator) nodeSelectorKey(clusterCIDR *networkingv1alpha1.ClusterCIDR) (string, error) {
var nodeSelector []byte var nodeSelector labels.Selector
var err error var err error
if clusterCIDR.Spec.NodeSelector != nil { if clusterCIDR.Spec.NodeSelector != nil {
nodeSelector, err = clusterCIDR.Spec.NodeSelector.Marshal() nodeSelector, err = v1helper.NodeSelectorAsSelector(clusterCIDR.Spec.NodeSelector)
} else { } else {
nodeSelector, err = defaultNodeSelector() nodeSelector, err = v1helper.NodeSelectorAsSelector(defaultNodeSelector())
} }
if err != nil { if err != nil {
return "", err return "", err
} }
return string(nodeSelector), nil return nodeSelector.String(), nil
} }
func listClusterCIDRs(kubeClient clientset.Interface) (*networkingv1alpha1.ClusterCIDRList, error) { func listClusterCIDRs(kubeClient clientset.Interface) (*networkingv1alpha1.ClusterCIDRList, error) {

5
pkg/controller/nodeipam/ipam/multi_cidr_range_allocator_test.go
View File

@ -34,6 +34,7 @@ import (
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"
k8stesting "k8s.io/client-go/testing" k8stesting "k8s.io/client-go/testing"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/controller"
cidrset "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/multicidrset" cidrset "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/multicidrset"
"k8s.io/kubernetes/pkg/controller/nodeipam/ipam/test" "k8s.io/kubernetes/pkg/controller/nodeipam/ipam/test"
@ -82,8 +83,8 @@ func getTestNodeSelector(requirements []testNodeSelectorRequirement) string {
testNodeSelector.NodeSelectorTerms = append(testNodeSelector.NodeSelectorTerms, nst) testNodeSelector.NodeSelectorTerms = append(testNodeSelector.NodeSelectorTerms, nst)
} }
marshalledSelector, _ := testNodeSelector.Marshal() selector, _ := v1helper.NodeSelectorAsSelector(testNodeSelector)
return string(marshalledSelector) return selector.String()
} }
func getTestCidrMap(testClusterCIDRMap map[string][]*testClusterCIDR) map[string][]*cidrset.ClusterCIDR { func getTestCidrMap(testClusterCIDRMap map[string][]*testClusterCIDR) map[string][]*cidrset.ClusterCIDR {