github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #111466 from jprzychodzen/nodeipam

Browse Source 
Enable 'running_managed_controllers' for KCM nodeipam controller
This commit is contained in:
Kubernetes Prow Robot 2022-08-01 10:24:40 -07:00 committed by GitHub
commit 4b5ee802e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats 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 { if err != nil {
return nil, true, err return nil, true, err
} }
go nodeIpamController.Run(ctx.Done()) go nodeIpamController.RunWithMetrics(ctx.Done(), controllerContext.ControllerManagerMetrics)
return nil, true, nil 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" clientset "k8s.io/client-go/kubernetes"
corelisters "k8s.io/client-go/listers/core/v1" corelisters "k8s.io/client-go/listers/core/v1"
cloudprovider "k8s.io/cloud-provider" cloudprovider "k8s.io/cloud-provider"
controllersmetrics "k8s.io/component-base/metrics/prometheus/controllers"
"k8s.io/component-base/metrics/prometheus/ratelimiter" "k8s.io/component-base/metrics/prometheus/ratelimiter"
"k8s.io/kubernetes/pkg/controller/nodeipam/ipam" "k8s.io/kubernetes/pkg/controller/nodeipam/ipam"
) )
@ -164,3 +165,10 @@ func (nc *Controller) Run(stopCh <-chan struct{}) {
<-stopCh <-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)
}