github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 18:02:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #113910 from mengjiao-liu/contextual-logging-pkg-controller-certificates

Browse Source 
clusterroleaggregation: use contextual logging
This commit is contained in:
Kubernetes Prow Robot 2023-03-10 04:34:50 -08:00 committed by GitHub
commit c88b61f553
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,10 +21,12 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/controller-manager/controller"
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/controller/clusterroleaggregation"
)
func startClusterRoleAggregrationController(ctx context.Context, controllerContext ControllerContext) (controller.Interface, bool, error) {
ctx = klog.NewContext(ctx, klog.LoggerWithName(klog.FromContext(ctx), "clusterrole-aggregation-controller"))
if !controllerContext.AvailableResources[schema.GroupVersionResource{Group: "rbac.authorization.k8s.io", Version: "v1", Resource: "clusterroles"}] {
return nil, false, nil
}

5
pkg/controller/clusterroleaggregation/clusterroleaggregation_controller.go
View File

@ -185,8 +185,9 @@ func (c *ClusterRoleAggregationController) Run(ctx context.Context, workers int)
defer utilruntime.HandleCrash()
defer c.queue.ShutDown()
klog.Infof("Starting ClusterRoleAggregator")
defer klog.Infof("Shutting down ClusterRoleAggregator")
logger := klog.FromContext(ctx)
logger.Info("Starting ClusterRoleAggregator controller")
defer logger.Info("Shutting down ClusterRoleAggregator controller")
if !cache.WaitForNamedCacheSync("ClusterRoleAggregator", ctx.Done(), c.clusterRolesSynced) {
return