Commit af2f650

openshift-merge-robot

authored

Merge pull request #16048 from smarterclayton/cadvisor_fix

Automatic merge from submit-queue UPSTREAM: 51473: Fix cAdvisor prometheus metrics Fixes #15974 @sjenning

2 parents 9c514fe + 42b9ef1 commit af2f650Copy full SHA for af2f650

2 files changed

+32

-16

lines changed

vendor/k8s.io/kubernetes/pkg/kubelet
- cadvisor
  - cadvisor_linux.go
- server
  - server.go

2 files changed

+32

-16

lines changed

`‎vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/cadvisor_linux.go`

+16-8

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

`‎vendor/k8s.io/kubernetes/pkg/kubelet/server/server.go`

+16-8

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Comments

(0)