From 29086e2b0414b8dea39648a2423a7af7105209b8 Mon Sep 17 00:00:00 2001 From: JunYang Date: Sat, 14 Jan 2023 21:09:25 +0800 Subject: [PATCH] use klog instead of klog.V(0) --- pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go | 4 ++-- .../nodeipam/ipam/multi_cidr_range_allocator.go | 8 ++++---- pkg/controller/nodeipam/ipam/range_allocator.go | 6 +++--- pkg/controller/nodelifecycle/node_lifecycle_controller.go | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go b/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go index a46de486e95..f939e881d07 100644 --- a/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go +++ b/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go @@ -128,7 +128,7 @@ func NewCloudCIDRAllocator(client clientset.Interface, cloud cloudprovider.Inter DeleteFunc: controllerutil.CreateDeleteNodeHandler(ca.ReleaseCIDR), }) - klog.V(0).Infof("Using cloud CIDR allocator (provider: %v)", cloud.ProviderName()) + klog.Infof("Using cloud CIDR allocator (provider: %v)", cloud.ProviderName()) return ca, nil } @@ -137,7 +137,7 @@ func (ca *cloudCIDRAllocator) Run(stopCh <-chan struct{}) { // Start event processing pipeline. ca.broadcaster.StartStructuredLogging(0) - klog.V(0).Infof("Sending events to api server.") + klog.Infof("Sending events to api server.") ca.broadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: ca.client.CoreV1().Events("")}) defer ca.broadcaster.Shutdown() diff --git a/pkg/controller/nodeipam/ipam/multi_cidr_range_allocator.go b/pkg/controller/nodeipam/ipam/multi_cidr_range_allocator.go index 0efc28543a6..da4adec6129 100644 --- a/pkg/controller/nodeipam/ipam/multi_cidr_range_allocator.go +++ b/pkg/controller/nodeipam/ipam/multi_cidr_range_allocator.go @@ -175,13 +175,13 @@ func NewMultiCIDRRangeAllocator( if allocatorParams.ServiceCIDR != nil { ra.filterOutServiceRange(allocatorParams.ServiceCIDR) } else { - klog.V(0).Info("No Service CIDR provided. Skipping filtering out service addresses.") + klog.Info("No Service CIDR provided. Skipping filtering out service addresses.") } if allocatorParams.SecondaryServiceCIDR != nil { ra.filterOutServiceRange(allocatorParams.SecondaryServiceCIDR) } else { - klog.V(0).Info("No Secondary Service CIDR provided. Skipping filtering out secondary service addresses.") + klog.Info("No Secondary Service CIDR provided. Skipping filtering out secondary service addresses.") } if nodeList != nil { @@ -190,7 +190,7 @@ func NewMultiCIDRRangeAllocator( klog.V(4).Infof("Node %v has no CIDR, ignoring", node.Name) continue } - klog.V(0).Infof("Node %v has CIDR %s, occupying it in CIDR map", node.Name, node.Spec.PodCIDRs) + klog.Infof("Node %v has CIDR %s, occupying it in CIDR map", node.Name, node.Spec.PodCIDRs) if err := ra.occupyCIDRs(&node); err != nil { // This will happen if: // 1. We find garbage in the podCIDRs field. Retrying is useless. @@ -240,7 +240,7 @@ func (r *multiCIDRRangeAllocator) Run(stopCh <-chan struct{}) { // Start event processing pipeline. r.broadcaster.StartStructuredLogging(0) - klog.V(0).Infof("Started sending events to API Server.") + klog.Infof("Started sending events to API Server.") r.broadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: r.client.CoreV1().Events("")}) defer r.broadcaster.Shutdown() diff --git a/pkg/controller/nodeipam/ipam/range_allocator.go b/pkg/controller/nodeipam/ipam/range_allocator.go index 1b433549043..0562819949f 100644 --- a/pkg/controller/nodeipam/ipam/range_allocator.go +++ b/pkg/controller/nodeipam/ipam/range_allocator.go @@ -100,13 +100,13 @@ func NewCIDRRangeAllocator(client clientset.Interface, nodeInformer informers.No if allocatorParams.ServiceCIDR != nil { ra.filterOutServiceRange(allocatorParams.ServiceCIDR) } else { - klog.V(0).Info("No Service CIDR provided. Skipping filtering out service addresses.") + klog.Info("No Service CIDR provided. Skipping filtering out service addresses.") } if allocatorParams.SecondaryServiceCIDR != nil { ra.filterOutServiceRange(allocatorParams.SecondaryServiceCIDR) } else { - klog.V(0).Info("No Secondary Service CIDR provided. Skipping filtering out secondary service addresses.") + klog.Info("No Secondary Service CIDR provided. Skipping filtering out secondary service addresses.") } if nodeList != nil { @@ -164,7 +164,7 @@ func (r *rangeAllocator) Run(stopCh <-chan struct{}) { // Start event processing pipeline. r.broadcaster.StartStructuredLogging(0) - klog.V(0).Infof("Sending events to api server.") + klog.Infof("Sending events to api server.") r.broadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: r.client.CoreV1().Events("")}) defer r.broadcaster.Shutdown() diff --git a/pkg/controller/nodelifecycle/node_lifecycle_controller.go b/pkg/controller/nodelifecycle/node_lifecycle_controller.go index 59b74f646d5..df9d52b8926 100644 --- a/pkg/controller/nodelifecycle/node_lifecycle_controller.go +++ b/pkg/controller/nodelifecycle/node_lifecycle_controller.go @@ -1229,7 +1229,7 @@ func (nc *Controller) handleDisruption(ctx context.Context, zoneToNodeConditions if !allAreFullyDisrupted || !allWasFullyDisrupted { // We're switching to full disruption mode if allAreFullyDisrupted { - klog.V(0).Info("Controller detected that all Nodes are not-Ready. Entering master disruption mode.") + klog.Info("Controller detected that all Nodes are not-Ready. Entering master disruption mode.") for i := range nodes { if nc.runTaintManager { _, err := nc.markNodeAsReachable(ctx, nodes[i]) @@ -1256,7 +1256,7 @@ func (nc *Controller) handleDisruption(ctx context.Context, zoneToNodeConditions } // We're exiting full disruption mode if allWasFullyDisrupted { - klog.V(0).Info("Controller detected that some Nodes are Ready. Exiting master disruption mode.") + klog.Info("Controller detected that some Nodes are Ready. Exiting master disruption mode.") // When exiting disruption mode update probe timestamps on all Nodes. now := nc.now() for i := range nodes { @@ -1279,7 +1279,7 @@ func (nc *Controller) handleDisruption(ctx context.Context, zoneToNodeConditions if v == newState { continue } - klog.V(0).Infof("Controller detected that zone %v is now in state %v.", k, newState) + klog.Infof("Controller detected that zone %v is now in state %v.", k, newState) nc.setLimiterInZone(k, len(zoneToNodeConditions[k]), newState) nc.zoneStates[k] = newState }