Merge pull request #18637 from jsafrane/fix-metrics

Automatic merge from submit-queue (batch tested with PRs 18745, 18637). UPSTREAM: 59170: Fix kubelet PVC stale metrics Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1542135
openshift · Mar 1, 2018 · 47ae0e5 · 47ae0e5
2 parents e86caba + eba5a49
commit 47ae0e5
Show file tree

Hide file tree

Showing 10 changed files with 496 additions and 71 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/BUILD b/vendor/k8s.io/kubernetes/pkg/kubelet/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/metrics/BUILD b/vendor/k8s.io/kubernetes/pkg/kubelet/metrics/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/metrics/collectors/BUILD b/vendor/k8s.io/kubernetes/pkg/kubelet/metrics/collectors/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/metrics/collectors/helper_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/metrics/collectors/helper_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/metrics/collectors/volume_stats.go b/vendor/k8s.io/kubernetes/pkg/kubelet/metrics/collectors/volume_stats.go