Merge pull request #31576 from feiskyer/kuberuntime-filter

pkg/kubelet/api/testing/fake_runtime_service.go

@@ -188,9 +188,6 @@ func (r *FakeRuntimeService) ListPodSandbox(filter *runtimeApi.PodSandboxFilter)
 			if filter.Id != nil && filter.GetId() != id {
 				continue
 			}
-			if filter.Name != nil && filter.GetName() != s.Metadata.GetName() {
-				continue
-			}
 			if filter.State != nil && filter.GetState() != s.GetState() {
 				continue
 			}
@@ -304,9 +301,6 @@ func (r *FakeRuntimeService) ListContainers(filter *runtimeApi.ContainerFilter)
 			if filter.Id != nil && filter.GetId() != s.GetId() {
 				continue
 			}
-			if filter.Name != nil && filter.GetName() != s.Metadata.GetName() {
-				continue
-			}
 			if filter.PodSandboxId != nil && filter.GetPodSandboxId() != s.SandboxID {
 				continue
 			}

pkg/kubelet/api/v1alpha1/runtime/api.proto

@@ -271,16 +271,14 @@ message PodSandboxStatusResponse {
 // PodSandboxFilter is used to filter a list of PodSandboxes.
 // All those fields are combined with 'AND'
 message PodSandboxFilter {
-    // Name of the sandbox.
-    optional string name = 1;
     // ID of the sandbox.
-    optional string id = 2;
+    optional string id = 1;
     // State of the sandbox.
-    optional PodSandBoxState state = 3;
+    optional PodSandBoxState state = 2;
     // LabelSelector to select matches.
     // Only api.MatchLabels is supported for now and the requirements
     // are ANDed. MatchExpressions is not supported yet.
-    map<string, string> label_selector = 4;
+    map<string, string> label_selector = 3;
 }
 
 message ListPodSandboxRequest {
@@ -495,18 +493,16 @@ enum ContainerState {
 // ContainerFilter is used to filter containers.
 // All those fields are combined with 'AND'
 message ContainerFilter {
-    // Name of the container.
-    optional string name = 1;
     // ID of the container.
-    optional string id = 2;
+    optional string id = 1;
     // State of the container.
-    optional ContainerState state = 3;
+    optional ContainerState state = 2;
     // The id of the pod sandbox
-    optional string pod_sandbox_id = 4;
+    optional string pod_sandbox_id = 3;
     // LabelSelector to select matches.
     // Only api.MatchLabels is supported for now and the requirements
     // are ANDed. MatchExpressions is not supported yet.
-    map<string, string> label_selector = 5;
+    map<string, string> label_selector = 4;
 }
 
 message ListContainersRequest {

pkg/kubelet/dockershim/docker_container.go

@@ -71,11 +71,7 @@ func (ds *dockerService) ListContainers(filter *runtimeApi.ContainerFilter) ([]*
 			glog.V(5).Infof("Unable to convert docker to runtime API container: %v", err)
 			continue
 		}
-		if len(filter.GetName()) != 0 && converted.Metadata.GetName() != filter.GetName() {
-			// TODO: Remove "name" from the ContainerFilter because name can no
-			// longer be used to identify a container.
-			continue
-		}
+
 		result = append(result, converted)
 	}
 	return result, nil

pkg/kubelet/dockershim/docker_sandbox.go

@@ -180,17 +180,11 @@ func (ds *dockerService) ListPodSandbox(filter *runtimeApi.PodSandboxFilter) ([]
 	result := []*runtimeApi.PodSandbox{}
 	for i := range containers {
 		c := containers[i]
-
 		converted, err := toRuntimeAPISandbox(&c)
 		if err != nil {
 			glog.V(5).Infof("Unable to convert docker to runtime API sandbox: %v", err)
 			continue
 		}
-		if len(filter.GetName()) > 0 && converted.Metadata.GetName() != filter.GetName() {
-			// TODO: Remove "name" from the SandboxFilter because name can no
-			// longer be used to identify a container.
-			continue
-		}
 		if filterOutReadySandboxes && converted.GetState() == runtimeApi.PodSandBoxState_READY {
 			continue
 		}