github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-21 01:50:55 +00:00
Code Issues Projects Releases Wiki Activity

Handle invalid selectors properly

Browse Source
This commit is contained in:
Jordan Liggitt
2022-01-14 11:41:07 -05:00
parent 8c6b910e68
commit c0af728f43
20 changed files with 47 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/replicaset/replica_set.go
View File

@@ -668,7 +668,7 @@ func (rsc *ReplicaSetController) syncReplicaSet(ctx context.Context, key string)
rsNeedsSync := rsc.expectations.SatisfiedExpectations(key)
selector, err := metav1.LabelSelectorAsSelector(rs.Spec.Selector)
if err != nil {
utilruntime.HandleError(fmt.Errorf("error converting pod selector to selector: %v", err))
utilruntime.HandleError(fmt.Errorf("error converting pod selector to selector for rs %v/%v: %v", namespace, name, err))
return nil
}
@@ -774,7 +774,8 @@ func (rsc *ReplicaSetController) getIndirectlyRelatedPods(rs *apps.ReplicaSet) (
for _, relatedRS := range rsc.getReplicaSetsWithSameController(rs) {
selector, err := metav1.LabelSelectorAsSelector(relatedRS.Spec.Selector)
if err != nil {
return nil, err
// This object has an invalid selector, it does not match any pods
continue
}
pods, err := rsc.podLister.Pods(relatedRS.Namespace).List(selector)
if err != nil {