Skip to content

Commit 194e4d0

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 371d2f6 commit 194e4d0

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

cmd/kubelet/app/server.go

+6
Original file line numberDiff line numberDiff line change
@@ -756,6 +756,12 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend
756756
cgroupRoots = append(cgroupRoots, s.SystemCgroups)
757757
}
758758

759+
// CARRY: Monitor extra cgroups that are specific to OpenShift deployments
760+
// Adding them here since there is no way to handle this via configuration atm
761+
// - ovs.slice is configured on clusters that use the NTO's PerformanceProfile and only exists together
762+
// with system-cpu-reserved
763+
cgroupRoots = append(cgroupRoots, "/ovs.slice")
764+
759765
if kubeDeps.CAdvisorInterface == nil {
760766
imageFsInfoProvider := cadvisor.NewImageFsInfoProvider(s.ContainerRuntimeEndpoint)
761767
kubeDeps.CAdvisorInterface, err = cadvisor.New(imageFsInfoProvider, s.RootDirectory, cgroupRoots, cadvisor.UsingLegacyCadvisorStats(s.ContainerRuntimeEndpoint), s.LocalStorageCapacityIsolation)

0 commit comments

Comments
 (0)