From c28b287253f83cc00143b8b6876af599c283b888 Mon Sep 17 00:00:00 2001 From: Mengjiao Liu Date: Tue, 15 Nov 2022 18:02:37 +0800 Subject: [PATCH] clusterroleaggregation: use contextual logging --- cmd/kube-controller-manager/app/rbac.go | 2 ++ .../clusterroleaggregation_controller.go | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/cmd/kube-controller-manager/app/rbac.go b/cmd/kube-controller-manager/app/rbac.go index 020ae38db63..2f39df58d2a 100644 --- a/cmd/kube-controller-manager/app/rbac.go +++ b/cmd/kube-controller-manager/app/rbac.go @@ -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 } diff --git a/pkg/controller/clusterroleaggregation/clusterroleaggregation_controller.go b/pkg/controller/clusterroleaggregation/clusterroleaggregation_controller.go index d4c779c984c..b2cdcb7aa34 100644 --- a/pkg/controller/clusterroleaggregation/clusterroleaggregation_controller.go +++ b/pkg/controller/clusterroleaggregation/clusterroleaggregation_controller.go @@ -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