Skip to content

Commit a506852

Browse files
MarSikbertinatto
authored andcommitted
UPSTREAM: <carry>: Export cpu stats of ovs.slice via prometheus
When a PerformanceProfile configures a node for cpu partitioning, it also lets OVS use all the cpus available to burstable pods. To be able to do that, OVS was moved to its own slice and that slice needs to be re-added to cAdvisor for monitoring purposes.
1 parent 2d584c9 commit a506852

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

cmd/kubelet/app/server.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -765,6 +765,12 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend
765765
cgroupRoots = append(cgroupRoots, s.SystemCgroups)
766766
}
767767

768+
// CARRY: Monitor extra cgroups that are specific to OpenShift deployments
769+
// Adding them here since there is no way to handle this via configuration atm
770+
// - ovs.slice is configured on clusters that use the NTO's PerformanceProfile and only exists together
771+
// with system-cpu-reserved
772+
cgroupRoots = append(cgroupRoots, "/ovs.slice")
773+
768774
if kubeDeps.CAdvisorInterface == nil {
769775
imageFsInfoProvider := cadvisor.NewImageFsInfoProvider(s.ContainerRuntimeEndpoint)
770776
kubeDeps.CAdvisorInterface, err = cadvisor.New(imageFsInfoProvider, s.RootDirectory, cgroupRoots, cadvisor.UsingLegacyCadvisorStats(s.ContainerRuntimeEndpoint), s.LocalStorageCapacityIsolation)

0 commit comments

Comments
 (0)