Skip to content

Commit a2dc34c

Browse files
committed
kubectl/describe: use function calls to build field selector
Instead of using string concatenation. Signed-off-by: Jingyuan Liang <[email protected]>
1 parent 60c4c2b commit a2dc34c

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
@@ -3631,10 +3631,11 @@ func (d *NodeDescriber) Describe(namespace, name string, describerSettings Descr
36313631
return "", err
36323632
}
36333633

3634-
fieldSelector, err := fields.ParseSelector("spec.nodeName=" + name + ",status.phase!=" + string(corev1.PodSucceeded) + ",status.phase!=" + string(corev1.PodFailed))
3635-
if err != nil {
3636-
return "", err
3637-
}
3634+
fieldSelector := fields.AndSelectors(
3635+
fields.OneTermEqualSelector("spec.nodeName", name),
3636+
fields.OneTermNotEqualSelector("status.phase", string(corev1.PodSucceeded)),
3637+
fields.OneTermNotEqualSelector("status.phase", string(corev1.PodFailed)),
3638+
)
36383639
// in a policy aware setting, users may have access to a node, but not all pods
36393640
// in that case, we note that the user does not have access to the pods
36403641
canViewPods := true

0 commit comments

Comments
 (0)