Skip to content

Commit 007e2ea

Browse files
authored
Merge pull request #30535 from haircommander/cri-stats
Document PodAndContainerStatsFromCRI feature
2 parents 29c2aed + 7c1e61a commit 007e2ea

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

content/en/docs/reference/command-line-tools-reference/feature-gates.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@ different Kubernetes components.
363363
| `PersistentLocalVolumes` | `false` | Alpha | 1.7 | 1.9 |
364364
| `PersistentLocalVolumes` | `true` | Beta | 1.10 | 1.13 |
365365
| `PersistentLocalVolumes` | `true` | GA | 1.14 | - |
366+
| `PodAndContainerStatsFromCRI` | `false` | Alpha | 1.23 | |
366367
| `PodDisruptionBudget` | `false` | Alpha | 1.3 | 1.4 |
367368
| `PodDisruptionBudget` | `true` | Beta | 1.5 | 1.20 |
368369
| `PodDisruptionBudget` | `true` | GA | 1.21 | - |
@@ -863,6 +864,8 @@ Each feature gate is designed for enabling/disabling a specific feature:
863864
feature which allows users to influence ReplicaSet downscaling order.
864865
- `PersistentLocalVolumes`: Enable the usage of `local` volume type in Pods.
865866
Pod affinity has to be specified if requesting a `local` volume.
867+
- `PodAndContainerStatsFromCRI`: Configure the kubelet to gather container and pod stats from the CRI container runtime
868+
rather than gathering them from cAdvisor.
866869
- `PodDisruptionBudget`: Enable the [PodDisruptionBudget](/docs/tasks/run-application/configure-pdb/) feature.
867870
- `PodAffinityNamespaceSelector`: Enable the [Pod Affinity Namespace Selector](/docs/concepts/scheduling-eviction/assign-pod-node/#namespace-selector)
868871
and [CrossNamespacePodAffinity](/docs/concepts/policy/resource-quotas/#cross-namespace-pod-affinity-quota) quota scope features.

content/en/docs/tasks/debug-application-cluster/resource-metrics-pipeline.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,12 @@ Metrics Server collects metrics from the Summary API, exposed by
6565

6666
Learn more about the metrics server in
6767
[the design doc](https://github.com/kubernetes/community/blob/master/contributors/design-proposals/instrumentation/metrics-server.md).
68+
69+
### Summary API Source
70+
The [Kubelet](/docs/reference/command-line-tools-reference/kubelet/) gathers stats at node, volume, pod and container level, and omits
71+
them in the [Summary API](https://github.com/kubernetes/kubernetes/blob/7d309e0104fedb57280b261e5677d919cb2a0e2d/staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1/types.go)
72+
for consumers to read.
73+
74+
Pre-1.23, these resources have been primarily gathered from [cAdvisor](https://github.com/google/cadvisor). However, in 1.23 with the
75+
introduction of the `PodAndContainerStatsFromCRI` FeatureGate, container and pod level stats can be gathered by the CRI implementation.
76+
Note: this also requires support from the CRI implementations (containerd >= 1.6.0, CRI-O >= 1.23.0).

0 commit comments

Comments
 (0)