Merge pull request #24752 from rphillips/backports/87913_4.5

Bug 1816409: UPSTREAM: 87913: Add code to fix kubelet/metrics memory issue.
openshift · Mar 24, 2020 · 4db8824 · 4db8824
2 parents e6144f3 + 43c51e4
commit 4db8824
Show file tree

Hide file tree

Showing 2 changed files with 103 additions and 5 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/server/server.go b/vendor/k8s.io/kubernetes/pkg/kubelet/server/server.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/server/server_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/server/server_test.go