Skip to content

Commit 5302055

Browse files
authored
Merge pull request kubernetes#126588 from jingyuanliang/master
kubectl/describe: use function calls to build field selector
2 parents cdfabdc + a2dc34c commit 5302055

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

staging/src/k8s.io/kubectl/pkg/describe/describe.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3640,10 +3640,11 @@ func (d *NodeDescriber) Describe(namespace, name string, describerSettings Descr
36403640
return "", err
36413641
}
36423642

3643-
fieldSelector, err := fields.ParseSelector("spec.nodeName=" + name + ",status.phase!=" + string(corev1.PodSucceeded) + ",status.phase!=" + string(corev1.PodFailed))
3644-
if err != nil {
3645-
return "", err
3646-
}
3643+
fieldSelector := fields.AndSelectors(
3644+
fields.OneTermEqualSelector("spec.nodeName", name),
3645+
fields.OneTermNotEqualSelector("status.phase", string(corev1.PodSucceeded)),
3646+
fields.OneTermNotEqualSelector("status.phase", string(corev1.PodFailed)),
3647+
)
36473648
// in a policy aware setting, users may have access to a node, but not all pods
36483649
// in that case, we note that the user does not have access to the pods
36493650
canViewPods := true

0 commit comments

Comments
 (0)