Merge pull request #22241 from RobertKrawitz/upstream-74222-mirror-po…

…d-getactivepods UPSTREAM: 74222: kubelet: return mirror pod in GetActivePods()
openshift · Mar 7, 2019 · f136358 · f136358
2 parents 995d7df + 9aa9e79
commit f136358
Show file tree

Hide file tree

Showing 3 changed files with 151 additions and 1 deletion.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go
diff --git a/vendor/k8s.io/kubernetes/test/e2e_node/BUILD b/vendor/k8s.io/kubernetes/test/e2e_node/BUILD
diff --git a/vendor/k8s.io/kubernetes/test/e2e_node/system_node_critical_test.go b/vendor/k8s.io/kubernetes/test/e2e_node/system_node_critical_test.go