scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable 'running_managed_controllers' for KCM nodeipam controller

Browse Source
This commit is contained in:
Jakub Przychodzeń
2022-07-27 14:30:40 +00:00
parent ce336550f1
commit 7dd4e89a99
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kube-controller-manager/app/core.go
View File

@@ -166,7 +166,7 @@ func startNodeIpamController(ctx context.Context, controllerContext ControllerCo
if err != nil {
return nil, true, err
}
go nodeIpamController.Run(ctx.Done())
go nodeIpamController.RunWithMetrics(ctx.Done(), controllerContext.ControllerManagerMetrics)
return nil, true, nil
}

8
pkg/controller/nodeipam/node_ipam_controller.go
View File

@@ -32,6 +32,7 @@ import (
clientset "k8s.io/client-go/kubernetes"
corelisters "k8s.io/client-go/listers/core/v1"
cloudprovider "k8s.io/cloud-provider"
controllersmetrics "k8s.io/component-base/metrics/prometheus/controllers"
"k8s.io/component-base/metrics/prometheus/ratelimiter"
"k8s.io/kubernetes/pkg/controller/nodeipam/ipam"
)
@@ -164,3 +165,10 @@ func (nc *Controller) Run(stopCh <-chan struct{}) {
<-stopCh
}
// RunWithMetrics is a wrapper for Run that also tracks starting and stopping of the nodeipam controller with additional metric
func (nc *Controller) RunWithMetrics(stopCh <-chan struct{}, controllerManagerMetrics *controllersmetrics.ControllerManagerMetrics) {
controllerManagerMetrics.ControllerStarted("nodeipam")
defer controllerManagerMetrics.ControllerStopped("nodeipam")
nc.Run(stopCh)
}