From 064df3889e83bf850360a4145c0659e92305429f Mon Sep 17 00:00:00 2001 From: Andrea Panattoni Date: Fri, 14 Jul 2023 14:32:24 +0200 Subject: [PATCH 1/2] Set zap log TimeEncoder Set a TimeEncoder for zap logging system to have more speaking timestamp. from `1.6893201844680622e+09` to `2023-07-14T09:52:29.539392293Z` Signed-off-by: Andrea Panattoni --- main.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.go b/main.go index 4e96fbb74..fed5ef862 100644 --- a/main.go +++ b/main.go @@ -25,6 +25,7 @@ import ( netattdefv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" openshiftconfigv1 "github.com/openshift/api/config/v1" mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1" + "go.uber.org/zap/zapcore" "k8s.io/apimachinery/pkg/api/errors" // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) @@ -77,6 +78,7 @@ func main() { "Enabling this will ensure there is only one active controller manager.") opts := zap.Options{ Development: true, + TimeEncoder: zapcore.RFC3339NanoTimeEncoder, } opts.BindFlags(flag.CommandLine) flag.Parse() From ed9d2dbaee92cbb43024f0caa0d8c20e44473c19 Mon Sep 17 00:00:00 2001 From: Andrea Panattoni Date: Fri, 14 Jul 2023 14:34:12 +0200 Subject: [PATCH 2/2] Reduce SriovOperator verbosity In `renderDevicePluginConfigData()`, avoid logging the full ResourceList for every resource in the loop. Avoid logging in helper functions, as they can be invoked in loops. Signed-off-by: Andrea Panattoni --- api/v1/helper.go | 1 - controllers/sriovnetworknodepolicy_controller.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/api/v1/helper.go b/api/v1/helper.go index 2087ca669..bdaa71a36 100644 --- a/api/v1/helper.go +++ b/api/v1/helper.go @@ -236,7 +236,6 @@ func (p *SriovNetworkNodePolicy) Selected(node *corev1.Node) bool { } return false } - log.Info("Selected():", "node", node.Name) return true } diff --git a/controllers/sriovnetworknodepolicy_controller.go b/controllers/sriovnetworknodepolicy_controller.go index 77c7f094d..4dea76fea 100644 --- a/controllers/sriovnetworknodepolicy_controller.go +++ b/controllers/sriovnetworknodepolicy_controller.go @@ -576,7 +576,7 @@ func renderDsForCR(path string, data *render.RenderData) ([]*uns.Unstructured, e func (r *SriovNetworkNodePolicyReconciler) renderDevicePluginConfigData(ctx context.Context, pl *sriovnetworkv1.SriovNetworkNodePolicyList, node *corev1.Node) (dptypes.ResourceConfList, error) { logger := log.Log.WithName("renderDevicePluginConfigData") - logger.Info("Start to render device plugin config data") + logger.Info("Start to render device plugin config data", "node", node.Name) rcl := dptypes.ResourceConfList{} for _, p := range pl.Items { if p.Name == constants.DefaultPolicyName { @@ -608,7 +608,7 @@ func (r *SriovNetworkNodePolicyReconciler) renderDevicePluginConfigData(ctx cont return rcl, err } rcl.ResourceList = append(rcl.ResourceList, *rc) - logger.Info("Add resource", "Resource", *rc, "Resource list", rcl.ResourceList) + logger.Info("Add resource", "Resource", *rc) } } return rcl, nil