Merge pull request #409 from Random-Liu/cherrypick-#406-release-1.11

[release-1.11] Cherrypick #406
kubernetes-sigs · Nov 10, 2018 · b6bd6d4 · b6bd6d4
2 parents edabfb5 + ad6f472
commit b6bd6d4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 26 deletions.
diff --git a/cmd/crictl/constants.go b/cmd/crictl/constants.go
diff --git a/cmd/crictl/sandbox.go b/cmd/crictl/sandbox.go
@@ -433,10 +433,10 @@ func ListPodSandboxes(client pb.RuntimeServiceClient, opts listOptions) error {
 	}
 	for _, pod := range r.Items {
 		// Filter by pod name/namespace regular expressions.
-		if !podMatchesRegex(opts.podNameRegexp, pod.Labels[kubePodNameLabel]) {
+		if !podMatchesRegex(opts.podNameRegexp, pod.Metadata.Name) {
 			continue
 		}
-		if !podMatchesRegex(opts.podNamespaceRegexp, pod.Labels[kubePodNamespaceLabel]) {
+		if !podMatchesRegex(opts.podNamespaceRegexp, pod.Metadata.Namespace) {
 			continue
 		}