Merge pull request #108527 from ddebroy/instrumentedgc1

Pass instrumented runtime service to containerGC
This commit is contained in:
Kubernetes Prow Robot 2022-03-08 10:24:49 -08:00 committed by GitHub
commit 29ed12e76b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -195,6 +195,8 @@ func NewKubeGenericRuntimeManager(
getNodeAllocatable func() v1.ResourceList, getNodeAllocatable func() v1.ResourceList,
memoryThrottlingFactor float64, memoryThrottlingFactor float64,
) (KubeGenericRuntime, error) { ) (KubeGenericRuntime, error) {
runtimeService = newInstrumentedRuntimeService(runtimeService)
imageService = newInstrumentedImageManagerService(imageService)
kubeRuntimeManager := &kubeGenericRuntimeManager{ kubeRuntimeManager := &kubeGenericRuntimeManager{
recorder: recorder, recorder: recorder,
cpuCFSQuota: cpuCFSQuota, cpuCFSQuota: cpuCFSQuota,
@ -206,8 +208,8 @@ func NewKubeGenericRuntimeManager(
machineInfo: machineInfo, machineInfo: machineInfo,
osInterface: osInterface, osInterface: osInterface,
runtimeHelper: runtimeHelper, runtimeHelper: runtimeHelper,
runtimeService: newInstrumentedRuntimeService(runtimeService), runtimeService: runtimeService,
imageService: newInstrumentedImageManagerService(imageService), imageService: imageService,
internalLifecycle: internalLifecycle, internalLifecycle: internalLifecycle,
logManager: logManager, logManager: logManager,
runtimeClassManager: runtimeClassManager, runtimeClassManager: runtimeClassManager,