Merge pull request #406 from Random-Liu/use-metadata-to-filter

Use metadata to filter
kubernetes-sigs · Nov 9, 2018 · 4370621 · 4370621
2 parents ef6bc62 + cd33519
commit 4370621
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 28 deletions.
diff --git a/cmd/crictl/constants.go b/cmd/crictl/constants.go
diff --git a/cmd/crictl/container.go b/cmd/crictl/container.go
@@ -624,7 +624,7 @@ func ListContainers(client pb.RuntimeServiceClient, opts listOptions) error {
 	}
 	for _, c := range r.Containers {
 		// Filter by pod name/namespace regular expressions.
-		if !matchesRegex(opts.nameRegexp, c.Labels[kubeContainerNameLabel]) {
+		if !matchesRegex(opts.nameRegexp, c.Metadata.Name) {
 			continue
 		}
 		if opts.quiet {

diff --git a/cmd/crictl/sandbox.go b/cmd/crictl/sandbox.go
@@ -434,10 +434,10 @@ func ListPodSandboxes(client pb.RuntimeServiceClient, opts listOptions) error {
 	}
 	for _, pod := range r.Items {
 		// Filter by pod name/namespace regular expressions.
-		if !matchesRegex(opts.nameRegexp, pod.Labels[kubePodNameLabel]) {
+		if !matchesRegex(opts.nameRegexp, pod.Metadata.Name) {
 			continue
 		}
-		if !matchesRegex(opts.podNamespaceRegexp, pod.Labels[kubePodNamespaceLabel]) {
+		if !matchesRegex(opts.podNamespaceRegexp, pod.Metadata.Namespace) {
 			continue
 		}