Merge pull request #26237 from rphillips/pod_status_patches_3.11

[release-3.11] Bug 1930100: Pod status patches
openshift · Jul 6, 2021 · fa67f7b · fa67f7b
2 parents 35459bc + a365637
commit fa67f7b
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 38 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/status/status_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/status/status_manager.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/status/status_manager_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/status/status_manager_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/util/pod/pod.go b/vendor/k8s.io/kubernetes/pkg/util/pod/pod.go
diff --git a/vendor/k8s.io/kubernetes/pkg/util/pod/pod_test.go b/vendor/k8s.io/kubernetes/pkg/util/pod/pod_test.go