summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com>2019-08-06 08:17:59 -0700
committerGitHub <noreply@github.com>2019-08-06 08:17:59 -0700
commit7ba8becebadfe6eeedc964f52d2aa5515e073f00 (patch)
tree68d2d4750cdd3819c56470a3b1ddc20a382733b2
parent5da171f5e5ad3e5b693ea0fa817a7f62ee04390b (diff)
parentf47fc3ee18b59cc37f8dbc7d5892703bcc96605d (diff)
Merge pull request #3675 from mattjmcnaughton/mattjmcnaughton/update-cri-container-stats-documentation
Update cri-container-stats documentation
-rw-r--r--contributors/devel/sig-node/cri-container-stats.md11
1 files changed, 7 insertions, 4 deletions
diff --git a/contributors/devel/sig-node/cri-container-stats.md b/contributors/devel/sig-node/cri-container-stats.md
index c72f2c8b..a760d404 100644
--- a/contributors/devel/sig-node/cri-container-stats.md
+++ b/contributors/devel/sig-node/cri-container-stats.md
@@ -115,7 +115,10 @@ behind it.*
## Status
-The container metrics calls are added to CRI in Kubernetes 1.7, but Kubelet does not
-yet use it to gather metrics from the runtime. We plan to enable Kubelet to
-optionally consume the container metrics from the API in 1.8.
-
+The container metrics calls were added to CRI in Kubernetes 1.7, but Kubelet did not
+yet use it to gather metrics from the runtime. In Kubernetes 1.8, Kubelet was
+given the option to [consume the container metrics using CRI
+stats](https://github.com/kubernetes/kubernetes/pull/51557). See the
+`pkg/kubelet/cadvisor.go#UsingLegacyCadvisorStats`
+[function](https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/cadvisor/util.go#L73)
+for more information on how Kubelet determines the proper metrics source.