kuberuntime: remove the kubernetesManagedLabel label

The CRI shim should be responsible for returning only those
containers/sandboxes created through CRI. Remove this label in kubelet.
This commit is contained in:
Yu-Ju Hong
2017-01-27 17:01:23 -08:00
parent 8fa38196a9
commit c436671cca
3 changed files with 3 additions and 30 deletions

View File

@@ -188,18 +188,7 @@ func (m *kubeGenericRuntimeManager) getKubeletSandboxes(all bool) ([]*runtimeapi
return nil, err
}
result := []*runtimeapi.PodSandbox{}
for _, s := range resp {
if !isManagedByKubelet(s.Labels) {
glog.V(5).Infof("Sandbox %s is not managed by kubelet", kubecontainer.BuildPodFullName(
s.Metadata.Name, s.Metadata.Namespace))
continue
}
result = append(result, s)
}
return result, nil
return resp, nil
}
// determinePodSandboxIP determines the IP address of the given pod sandbox.