mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-15 14:26:57 +00:00
939ad4115a
Automatic merge from submit-queue kubelet/rkt - treat pod container as the infra - only network stats As no "container name" annotation was being applied to the pod as a whole, the rkt pod container didn't have a container name label. This means that in stat/summary it came up as a nameless container that belonged to the pod. this was problematic as it caused double counting of container stats. this adds a container name annotation to the pod level which will be overridden during label creation by annotations of the same name at the container level for the containers themselves. stats/summary will do the right thing as it will treat it the same as the infra container, just get network stats from it. Suppress #26759 cc @kubernetes/sig-node @kubernetes/rktnetes-maintainers