From 4a44bd5aaab20ff377b5e894432d6d136550fb92 Mon Sep 17 00:00:00 2001 From: Lan Luo Date: Thu, 24 Mar 2022 10:33:19 +0800 Subject: [PATCH] Refine logs with upper case Signed-off-by: Lan Luo --- .../v1alpha1/zz_generated.deepcopy.go | 1 + .../memberclusterannounce_webhook.go | 2 +- .../multicluster/commonarea/common_area.go | 2 +- .../commonarea/mock_remote_common_area.go | 2 +- .../commonarea/remote_common_area.go | 11 +++-- .../commonarea/resourceimport_controller.go | 32 +++++++-------- .../leader_clusterset_controller.go | 7 ++-- .../member_clusterset_controller.go | 6 +-- .../multicluster/resourceexport_controller.go | 8 ++-- .../multicluster/serviceexport_controller.go | 40 +++++++++---------- 10 files changed, 55 insertions(+), 56 deletions(-) diff --git a/multicluster/apis/multicluster/v1alpha1/zz_generated.deepcopy.go b/multicluster/apis/multicluster/v1alpha1/zz_generated.deepcopy.go index 1811af33287..bff1779a65d 100644 --- a/multicluster/apis/multicluster/v1alpha1/zz_generated.deepcopy.go +++ b/multicluster/apis/multicluster/v1alpha1/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/multicluster/cmd/multicluster-controller/memberclusterannounce_webhook.go b/multicluster/cmd/multicluster-controller/memberclusterannounce_webhook.go index 9629d41fe50..de7253b4a7c 100644 --- a/multicluster/cmd/multicluster-controller/memberclusterannounce_webhook.go +++ b/multicluster/cmd/multicluster-controller/memberclusterannounce_webhook.go @@ -43,7 +43,7 @@ func (v *memberClusterAnnounceValidator) Handle(ctx context.Context, req admissi memberClusterAnnounce := &multiclusterv1alpha1.MemberClusterAnnounce{} e := v.decoder.Decode(req, memberClusterAnnounce) if e != nil { - klog.ErrorS(e, "error while decoding") + klog.ErrorS(e, "Error while decoding") return admission.Errored(http.StatusBadRequest, e) } diff --git a/multicluster/controllers/multicluster/commonarea/common_area.go b/multicluster/controllers/multicluster/commonarea/common_area.go index b00480189f6..8c6da42536d 100644 --- a/multicluster/controllers/multicluster/commonarea/common_area.go +++ b/multicluster/controllers/multicluster/commonarea/common_area.go @@ -25,7 +25,7 @@ import ( // CommonArea is an interface that provides access to the common area of a ClusterSet. // Common Area of a ClusterSet is a Namespace in the leader cluster. type CommonArea interface { - // Client grants read/write to the namespace of the cluster that is backing this CommonArea. + // Client grants read/write to the Namespace of the cluster that is backing this CommonArea. client.Client // GetClusterID returns the clusterID of the cluster accessed by this CommonArea. diff --git a/multicluster/controllers/multicluster/commonarea/mock_remote_common_area.go b/multicluster/controllers/multicluster/commonarea/mock_remote_common_area.go index 048c4ae3af6..8f409ab8764 100644 --- a/multicluster/controllers/multicluster/commonarea/mock_remote_common_area.go +++ b/multicluster/controllers/multicluster/commonarea/mock_remote_common_area.go @@ -14,7 +14,7 @@ // // Code generated by MockGen. DO NOT EDIT. -// Source: controllers/multicluster/core/remote_common_area.go +// Source: controllers/multicluster/commonarea/remote_common_area.go // package commonarea is a generated GoMock package. package commonarea diff --git a/multicluster/controllers/multicluster/commonarea/remote_common_area.go b/multicluster/controllers/multicluster/commonarea/remote_common_area.go index 6ccd30ee7dd..a15dc4a269d 100644 --- a/multicluster/controllers/multicluster/commonarea/remote_common_area.go +++ b/multicluster/controllers/multicluster/commonarea/remote_common_area.go @@ -139,7 +139,7 @@ func NewRemoteCommonArea(clusterID common.ClusterID, clusterSetID common.Cluster Namespace: clusterSetNamespace, }) if err != nil { - klog.ErrorS(err, "error creating manager for RemoteCommonArea", "Cluster", clusterID) + klog.ErrorS(err, "Error creating manager for RemoteCommonArea", "Cluster", clusterID) return nil, err } @@ -221,9 +221,8 @@ func (r *remoteCommonArea) SendMemberAnnounce() error { // Add timestamp to force update on MemberClusterAnnounce. Leader cluster requires // periodic updates to detect connectivity. Without this, no-op updates will be ignored. localClusterMemberAnnounce.Annotations[TimestampAnnotationKey] = time.Now().String() - // do an update if err := r.Update(context.TODO(), &localClusterMemberAnnounce, &client.UpdateOptions{}); err != nil { - klog.ErrorS(err, "error updating MemberClusterAnnounce", "Cluster", r.GetClusterID()) + klog.ErrorS(err, "Error updating MemberClusterAnnounce", "Cluster", r.GetClusterID()) return err } } else { @@ -341,7 +340,7 @@ func (r *remoteCommonArea) Start() (context.CancelFunc, error) { func (r *remoteCommonArea) doMemberAnnounce() { if err := r.SendMemberAnnounce(); err != nil { - klog.ErrorS(err, "error writing member announce", "Cluster", r.GetClusterID()) + klog.ErrorS(err, "Error writing member announce", "Cluster", r.GetClusterID()) r.updateRemoteCommonAreaStatus(false, err) } else { r.updateRemoteCommonAreaStatus(true, nil) @@ -383,7 +382,7 @@ func (r *remoteCommonArea) StartWatching() error { ) if err := resImportReconciler.SetupWithManager(r.ClusterManager); err != nil { - klog.V(2).ErrorS(err, "error creating ResourceImport controller for RemoteCommonArea", "Cluster", r.ClusterID) + klog.V(2).ErrorS(err, "Error creating ResourceImport controller for RemoteCommonArea", "Cluster", r.ClusterID) return fmt.Errorf("error creating ResourceImport controller for RemoteCommonArea: %v", err) } @@ -396,7 +395,7 @@ func (r *remoteCommonArea) StartWatching() error { // the leader again, it starts the Manager again. err := r.ClusterManager.Start(stopCtx) if err != nil { - klog.ErrorS(err, "error starting ClusterManager for RemoteCommonArea", "Cluster", r.ClusterID) + klog.ErrorS(err, "Error starting ClusterManager for RemoteCommonArea", "Cluster", r.ClusterID) } klog.InfoS("Stopping ClusterManager for RemoteCommonArea", "Cluster", r.ClusterID) }() diff --git a/multicluster/controllers/multicluster/commonarea/resourceimport_controller.go b/multicluster/controllers/multicluster/commonarea/resourceimport_controller.go index 5a2d0b816c1..4764743a3d7 100644 --- a/multicluster/controllers/multicluster/commonarea/resourceimport_controller.go +++ b/multicluster/controllers/multicluster/commonarea/resourceimport_controller.go @@ -115,7 +115,7 @@ func (r *ResourceImportReconciler) Reconcile(ctx context.Context, req ctrl.Reque resImp = resImpObj.(multiclusterv1alpha1.ResourceImport) } else { // stale_controller will reconcile and clean up MC Service/ServiceImport, so it's ok to return nil here - klog.ErrorS(err, "no cached data for ResourceImport", "resourceimport", req.NamespacedName.String()) + klog.ErrorS(err, "No cached data for ResourceImport", "resourceimport", req.NamespacedName.String()) return ctrl.Result{}, nil } } @@ -158,8 +158,8 @@ func (r *ResourceImportReconciler) handleResImpUpdateForService(ctx context.Cont // Here we will skip creating derived MC Service when a Service with the same name // already exists but it not previously created by Importer. if _, ok := svc.Annotations[common.AntreaMCServiceAnnotation]; !ok { - err := errors.New("unable to import Service which conflicts with existing one") - klog.ErrorS(err, "", "service", klog.KObj(svc)) + err := errors.New("the Service conflicts with existing one") + klog.ErrorS(err, "Unable to import Service", "service", klog.KObj(svc)) return ctrl.Result{}, err } } @@ -167,13 +167,13 @@ func (r *ResourceImportReconciler) handleResImpUpdateForService(ctx context.Cont if svcNotFound { err := r.localClusterClient.Create(ctx, svcObj, &client.CreateOptions{}) if err != nil { - klog.ErrorS(err, "failed to create Service", "service", klog.KObj(svcObj)) + klog.ErrorS(err, "Failed to create Service", "service", klog.KObj(svcObj)) return ctrl.Result{}, err } if err = r.localClusterClient.Get(ctx, svcName, svc); err != nil { // Ignore the error here, and requeue the event again when both Service // and ServiceImport are created later - klog.ErrorS(err, "failed to get latest imported Service", "service", klog.KObj(svc)) + klog.ErrorS(err, "Failed to get latest imported Service", "service", klog.KObj(svc)) } } @@ -191,7 +191,7 @@ func (r *ResourceImportReconciler) handleResImpUpdateForService(ctx context.Cont if svcImpNotFound { err := r.localClusterClient.Create(ctx, svcImpObj, &client.CreateOptions{}) if err != nil { - klog.ErrorS(err, "failed to create ServiceImport", "serviceimport", klog.KObj(svcImpObj)) + klog.ErrorS(err, "Failed to create ServiceImport", "serviceimport", klog.KObj(svcImpObj)) return ctrl.Result{}, err } r.installedResImports.Add(*resImp) @@ -207,7 +207,7 @@ func (r *ResourceImportReconciler) handleResImpUpdateForService(ctx context.Cont svc.Spec.Ports = svcObj.Spec.Ports err = r.localClusterClient.Update(ctx, svc, &client.UpdateOptions{}) if err != nil { - klog.ErrorS(err, "failed to update imported Service", "service", svcName.String()) + klog.ErrorS(err, "Failed to update imported Service", "service", svcName.String()) return ctrl.Result{}, err } r.installedResImports.Update(*resImp) @@ -218,7 +218,7 @@ func (r *ResourceImportReconciler) handleResImpUpdateForService(ctx context.Cont addAnnotation(svcImp, r.localClusterID) err = r.localClusterClient.Update(ctx, svcImp, &client.UpdateOptions{}) if err != nil { - klog.ErrorS(err, "failed to update ServiceImport", "serviceimport", svcImpName.String()) + klog.ErrorS(err, "Failed to update ServiceImport", "serviceimport", svcImpName.String()) return ctrl.Result{}, err } r.installedResImports.Update(*resImp) @@ -277,8 +277,8 @@ func (r *ResourceImportReconciler) handleResImpUpdateForEndpoints(ctx context.Co } if !epNotFound { if _, ok := ep.Annotations[common.AntreaMCServiceAnnotation]; !ok { - err := errors.New("unable to import Endpoints which conflicts with existing one") - klog.ErrorS(err, "", "endpoints", klog.KObj(ep)) + err := errors.New("the Endpoints conflicts with existing one") + klog.ErrorS(err, "Unable to import Endpoints", "endpoints", klog.KObj(ep)) return ctrl.Result{}, err } } @@ -292,7 +292,7 @@ func (r *ResourceImportReconciler) handleResImpUpdateForEndpoints(ctx context.Co } else if apierrors.IsNotFound(err) { newSubsets = resImp.Spec.Endpoints.Subsets } else { - klog.ErrorS(err, "failed to get local Endpoint", "endpoint", epNamespaced.String()) + klog.ErrorS(err, "Failed to get local Endpoint", "endpoint", epNamespaced.String()) return ctrl.Result{}, err } mcsEpObj := &corev1.Endpoints{ @@ -306,14 +306,14 @@ func (r *ResourceImportReconciler) handleResImpUpdateForEndpoints(ctx context.Co if epNotFound { err := r.localClusterClient.Create(ctx, mcsEpObj, &client.CreateOptions{}) if err != nil { - klog.ErrorS(err, "failed to create MCS Endpoints", "endpoints", klog.KObj(mcsEpObj), err) + klog.ErrorS(err, "Failed to create MCS Endpoints", "endpoints", klog.KObj(mcsEpObj), err) return ctrl.Result{}, err } r.installedResImports.Add(*resImp) return ctrl.Result{}, nil } if _, ok := ep.Annotations[common.AntreaMCServiceAnnotation]; !ok { - klog.InfoS("Endpoints has no desired annotation "+common.AntreaMCServiceAnnotation+", skip update", "endpoints", epNamespaced.String()) + klog.InfoS("Endpoints has no desired annotation, skip update", "annotation", common.AntreaMCServiceAnnotation, "endpoints", epNamespaced.String()) return ctrl.Result{}, nil } // TODO: check label difference ? @@ -321,7 +321,7 @@ func (r *ResourceImportReconciler) handleResImpUpdateForEndpoints(ctx context.Co ep.Subsets = newSubsets err = r.localClusterClient.Update(ctx, ep, &client.UpdateOptions{}) if err != nil { - klog.ErrorS(err, "failed to update MCS Endpoints", "endpoints", epNamespaced.String()) + klog.ErrorS(err, "Failed to update MCS Endpoints", "endpoints", epNamespaced.String()) return ctrl.Result{}, err } r.installedResImports.Update(*resImp) @@ -338,12 +338,12 @@ func (r *ResourceImportReconciler) handleResImpDeleteForEndpoints(ctx context.Co ep := &corev1.Endpoints{} err := r.localClusterClient.Get(ctx, epNamespaced, ep) if err != nil { - klog.InfoS("unable to fetch imported Endpoints", "endpoints", epNamespaced.String(), "err", err) + klog.InfoS("Unable to fetch imported Endpoints", "endpoints", epNamespaced.String(), "err", err) return ctrl.Result{}, client.IgnoreNotFound(err) } err = r.localClusterClient.Delete(ctx, ep, &client.DeleteOptions{}) if err != nil { - klog.InfoS("failed to delete imported Endpoints", "endpoints", epNamespaced.String(), "err", err) + klog.InfoS("Failed to delete imported Endpoints", "endpoints", epNamespaced.String(), "err", err) return ctrl.Result{}, client.IgnoreNotFound(err) } return ctrl.Result{}, nil diff --git a/multicluster/controllers/multicluster/leader_clusterset_controller.go b/multicluster/controllers/multicluster/leader_clusterset_controller.go index d82df3c88a6..b433f6c7ac1 100644 --- a/multicluster/controllers/multicluster/leader_clusterset_controller.go +++ b/multicluster/controllers/multicluster/leader_clusterset_controller.go @@ -69,7 +69,6 @@ func (r *LeaderClusterSetReconciler) Reconcile(ctx context.Context, req ctrl.Req if !errors.IsNotFound(err) { return ctrl.Result{}, err } - // if errors.IsNotFound(err) klog.InfoS("Received ClusterSet delete", "config", klog.KObj(clusterSet)) for _, removedMember := range r.clusterSetConfig.Spec.Members { r.StatusManager.RemoveMember(common.ClusterID(removedMember.ClusterID)) @@ -143,7 +142,7 @@ func (r *LeaderClusterSetReconciler) SetupWithManager(mgr ctrl.Manager) error { return ctrl.NewControllerManagedBy(mgr). For(&multiclusterv1alpha1.ClusterSet{}). WithOptions(controller.Options{ - MaxConcurrentReconciles: 5, // TODO: Use a constant after merging with Lan's changes + MaxConcurrentReconciles: common.DefaultWorkerCount, }). Complete(r) } @@ -226,7 +225,7 @@ func (r *LeaderClusterSetReconciler) updateStatus() { clusterSet := &multiclusterv1alpha1.ClusterSet{} err := r.Get(context.TODO(), namespacedName, clusterSet) if err != nil { - klog.ErrorS(err, "failed to read ClusterSet", "Name", namespacedName) + klog.ErrorS(err, "Failed to read ClusterSet", "Name", namespacedName) } status.Conditions = clusterSet.Status.Conditions if (len(clusterSet.Status.Conditions) == 1 && clusterSet.Status.Conditions[0].Status != overallCondition.Status) || @@ -236,6 +235,6 @@ func (r *LeaderClusterSetReconciler) updateStatus() { clusterSet.Status = status err = r.Status().Update(context.TODO(), clusterSet) if err != nil { - klog.ErrorS(err, "failed to update Status of ClusterSet", "Name", namespacedName) + klog.ErrorS(err, "Failed to update Status of ClusterSet", "Name", namespacedName) } } diff --git a/multicluster/controllers/multicluster/member_clusterset_controller.go b/multicluster/controllers/multicluster/member_clusterset_controller.go index b985e44c9ce..d02985cdc9c 100644 --- a/multicluster/controllers/multicluster/member_clusterset_controller.go +++ b/multicluster/controllers/multicluster/member_clusterset_controller.go @@ -135,7 +135,7 @@ func (r *MemberClusterSetReconciler) updateMultiClusterSetOnMemberCluster(cluste r.RemoteCommonAreaManager = commonarea.NewRemoteCommonAreaManager(r.clusterSetID, r.clusterID) err := r.RemoteCommonAreaManager.Start() if err != nil { - klog.ErrorS(err, "error starting RemoteCommonAreaManager") + klog.ErrorS(err, "Error starting RemoteCommonAreaManager") r.RemoteCommonAreaManager = nil r.clusterSetID = common.InvalidClusterSetID r.clusterID = common.InvalidClusterID @@ -277,7 +277,7 @@ func (r *MemberClusterSetReconciler) updateStatus() { clusterSet := &multiclusterv1alpha1.ClusterSet{} err := r.Get(context.TODO(), namespacedName, clusterSet) if err != nil { - klog.ErrorS(err, "failed to read ClusterSet", "Name", namespacedName) + klog.ErrorS(err, "Failed to read ClusterSet", "Name", namespacedName) } status.Conditions = clusterSet.Status.Conditions if (len(clusterSet.Status.Conditions) == 1 && clusterSet.Status.Conditions[0].Status != overallCondition.Status) || @@ -287,6 +287,6 @@ func (r *MemberClusterSetReconciler) updateStatus() { clusterSet.Status = status err = r.Status().Update(context.TODO(), clusterSet) if err != nil { - klog.ErrorS(err, "failed to update Status of ClusterSet", "Name", namespacedName) + klog.ErrorS(err, "Failed to update Status of ClusterSet", "Name", namespacedName) } } diff --git a/multicluster/controllers/multicluster/resourceexport_controller.go b/multicluster/controllers/multicluster/resourceexport_controller.go index 79e5a170ab1..5ebede40dbc 100644 --- a/multicluster/controllers/multicluster/resourceexport_controller.go +++ b/multicluster/controllers/multicluster/resourceexport_controller.go @@ -136,9 +136,9 @@ func (r *ResourceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reque return ctrl.Result{}, err } r.updateResourceExportStatus(&resExport, succeed) - klog.InfoS("Create ResourceImport successfully", "resourceimport", resImportName.String()) + klog.V(2).InfoS("ResourceImport is created successfully", "resourceimport", resImportName.String()) } else if changed { - klog.InfoS("Update ResourceImport for ResoureExport", "resourceimport", resImportName.String(), "resourceexport", req.NamespacedName) + klog.V(2).InfoS("Updating ResourceImport for ResoureExport", "resourceimport", resImportName.String(), "resourceexport", req.NamespacedName) if err = r.handleUpdateEvent(ctx, resImport, &resExport); err != nil { return ctrl.Result{}, err } @@ -452,7 +452,7 @@ func (r *ResourceExportReconciler) updateResourceExportStatus(resExport *mcsv1al } err := r.Client.Status().Update(ctx, resExport) if err != nil { - klog.ErrorS(err, "failed to update ResourceExport status", "resourceexport", klog.KObj(resExport)) + klog.ErrorS(err, "Failed to update ResourceExport status", "resourceexport", klog.KObj(resExport)) } } @@ -467,7 +467,7 @@ func (r *ResourceExportReconciler) deleteResourceExport(resExport *mcsv1alpha1.R // SetupWithManager sets up the controller with the Manager. func (r *ResourceExportReconciler) SetupWithManager(mgr ctrl.Manager) error { - // ignore status update event via GenerationChangedPredicate + // Ignore status update event via GenerationChangedPredicate instance := predicate.GenerationChangedPredicate{} return ctrl.NewControllerManagedBy(mgr). For(&mcsv1alpha1.ResourceExport{}). diff --git a/multicluster/controllers/multicluster/serviceexport_controller.go b/multicluster/controllers/multicluster/serviceexport_controller.go index 00268c09e19..44a3f48ce6f 100644 --- a/multicluster/controllers/multicluster/serviceexport_controller.go +++ b/multicluster/controllers/multicluster/serviceexport_controller.go @@ -149,22 +149,22 @@ func epIndexerByLabelFunc(obj interface{}) ([]string, error) { // and also Endpoints/Services resource. It will create/update/remove ResourceExport // in a leader cluster for corresponding ServiceExport from a member cluster. func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) { - klog.V(2).InfoS("reconciling ServiceExport", "serviceexport", req.NamespacedName) + klog.V(2).InfoS("Reconciling ServiceExport", "serviceexport", req.NamespacedName) svcExportList := &k8smcsv1alpha1.ServiceExportList{} err := r.Client.List(ctx, svcExportList, &client.ListOptions{}) if err != nil { - klog.ErrorS(err, "failed to list ServiceExport") + klog.ErrorS(err, "Failed to list ServiceExport") return ctrl.Result{}, err } // return faster during initilization instead of handling all Service/Endpoint events if len(svcExportList.Items) == 0 && len(r.installedSvcs.List()) == 0 { - klog.InfoS("skip reconciling, no corresponding ServiceExport") + klog.InfoS("Skip reconciling, no corresponding ServiceExport") return ctrl.Result{}, nil } if *r.remoteCommonAreaManager == nil { - klog.InfoS("clusterset has not been initialized properly, no remote cluster manager") + klog.InfoS("ClusterSet has not been initialized properly, no remote cluster manager") return ctrl.Result{Requeue: true}, nil } r.localClusterID = string((*r.remoteCommonAreaManager).GetLocalClusterID()) @@ -189,7 +189,7 @@ func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reques svc := &corev1.Service{} if err := r.Client.Get(ctx, req.NamespacedName, &svcExport); err != nil { - klog.V(2).InfoS("unable to fetch ServiceExport", "serviceexport", req.String(), "err", err) + klog.V(2).ErrorS(err, "Unable to fetch ServiceExport", "serviceexport", req.String()) if !apierrors.IsNotFound(err) { return ctrl.Result{}, err } @@ -229,7 +229,7 @@ func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reques } return ctrl.Result{}, nil } else { - klog.ErrorS(err, "failed to get Service ", req.String()) + klog.ErrorS(err, "Failed to get Service ", req.String()) return ctrl.Result{}, err } } @@ -237,7 +237,7 @@ func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reques // skip if ServiceExport is trying to export MC Service/Endpoints if !svcInstalled || !epInstalled { if _, ok := svc.Annotations[common.AntreaMCServiceAnnotation]; ok { - klog.InfoS("it's not allowed to export the multi-cluster controller auto-generated Service", "service", req.String()) + klog.InfoS("It's not allowed to export the multi-cluster controller auto-generated Service", "service", req.String()) err = r.updateSvcExportStatus(ctx, req, importedService) if err != nil { return ctrl.Result{}, err @@ -270,7 +270,7 @@ func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reques err = r.Client.Get(ctx, req.NamespacedName, ep) if err != nil { - klog.ErrorS(err, "failed to get Endpoints", "endpoints", req.String()) + klog.ErrorS(err, "Failed to get Endpoints", "endpoints", req.String()) if apierrors.IsNotFound(err) && epInstalled { err = r.handleEndpointDeleteEvent(ctx, req, remoteCluster) if err != nil { @@ -316,7 +316,7 @@ func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reques "resourceexport", svcExportNSName) err := r.serviceHandler(ctx, req, svc, svcResExportName, re, remoteCluster) if err != nil { - klog.ErrorS(err, "failed to handle Service change", "service", req.String()) + klog.ErrorS(err, "Failed to handle Service change", "service", req.String()) return ctrl.Result{}, err } } @@ -326,7 +326,7 @@ func (r *ServiceExportReconciler) Reconcile(ctx context.Context, req ctrl.Reques req.String(), "resourceexport", epExportNSName) err := r.endpointsHandler(ctx, req, ep, epResExportName, re, remoteCluster) if err != nil { - klog.ErrorS(err, "failed to handle Endpoints change", "endpoints", req.String()) + klog.ErrorS(err, "Failed to handle Endpoints change", "endpoints", req.String()) return ctrl.Result{}, err } } @@ -352,11 +352,11 @@ func (r *ServiceExportReconciler) handleServiceDeleteEvent(ctx context.Context, svcResExportNamespaced := common.NamespacedName(r.leaderNamespace, svcResExportName) err := remoteCluster.Delete(ctx, svcResExport, &client.DeleteOptions{}) if err != nil && !apierrors.IsNotFound(err) { - klog.ErrorS(err, "failed to delete ResourceExport in remote cluster", "resourceexport", + klog.ErrorS(err, "Failed to delete ResourceExport in remote cluster", "resourceexport", svcResExportNamespaced, "clusterID", r.leaderClusterID) return err } - klog.V(2).InfoS("clean up ResourceExport in remote cluster", "resourceexport", svcResExportNamespaced) + klog.V(2).InfoS("Clean up ResourceExport in remote cluster", "resourceexport", svcResExportNamespaced) return nil } @@ -374,12 +374,12 @@ func (r *ServiceExportReconciler) handleEndpointDeleteEvent(ctx context.Context, epResExportNamespaced := common.NamespacedName(r.leaderNamespace, epResExportName) err := remoteCluster.Delete(ctx, epResExport, &client.DeleteOptions{}) if err != nil && !apierrors.IsNotFound(err) { - klog.ErrorS(err, "failed to delete ResourceExport in remote cluster", "resourceexport", + klog.ErrorS(err, "Failed to delete ResourceExport in remote cluster", "resourceexport", epResExportNamespaced, "clusterID", r.leaderClusterID) return err } - klog.V(2).InfoS("clean up ResourceExport in remote cluster", "resourceexport", epResExportNamespaced) + klog.V(2).InfoS("Clean up ResourceExport in remote cluster", "resourceexport", epResExportNamespaced) return nil } @@ -438,7 +438,7 @@ func (r *ServiceExportReconciler) updateSvcExportStatus(ctx context.Context, req } err = r.Client.Status().Update(ctx, svcExport) if err != nil { - klog.ErrorS(err, "failed to update ServiceExport", "serviceexport", req.String()) + klog.ErrorS(err, "Failed to update ServiceExport", "serviceexport", req.String()) return client.IgnoreNotFound(err) } return nil @@ -491,7 +491,7 @@ func (r *ServiceExportReconciler) serviceHandler( err := rc.Get(ctx, resNamespaced, existResExport) if err != nil { if !apierrors.IsNotFound(err) { - klog.ErrorS(err, "failed to get ResourceExport", "resourceexport", resNamespaced.String()) + klog.ErrorS(err, "Failed to get ResourceExport", "resourceexport", resNamespaced.String()) return err } } @@ -525,7 +525,7 @@ func (r *ServiceExportReconciler) endpointsHandler( err := rc.Get(ctx, resNamespaced, existResExport) if err != nil { if !apierrors.IsNotFound(err) { - klog.ErrorS(err, "failed to get ResourceExport", "resourceexport", resNamespaced.String()) + klog.ErrorS(err, "Failed to get ResourceExport", "resourceexport", resNamespaced.String()) return err } } @@ -575,10 +575,10 @@ func (r *ServiceExportReconciler) updateOrCreateResourceExport(resName string, resNamespaced := types.NamespacedName{Namespace: rc.GetNamespace(), Name: resName} if createResExport { newResExport.Finalizers = []string{common.ResourceExportFinalizer} - klog.InfoS("creating ResourceExport", "resourceexport", resNamespaced.String()) + klog.InfoS("Creating ResourceExport", "resourceexport", resNamespaced.String()) err := rc.Create(ctx, newResExport, &client.CreateOptions{}) if err != nil { - klog.ErrorS(err, "failed to create ResourceExport in leader cluster", "resourceexport", resNamespaced.String()) + klog.ErrorS(err, "Failed to create ResourceExport in leader cluster", "resourceexport", resNamespaced.String()) return err } } else { @@ -586,7 +586,7 @@ func (r *ServiceExportReconciler) updateOrCreateResourceExport(resName string, newResExport.Finalizers = existResExport.Finalizers err := rc.Update(ctx, newResExport, &client.UpdateOptions{}) if err != nil { - klog.ErrorS(err, "failed to update ResourceExport", "resourceexport", resNamespaced.String()) + klog.ErrorS(err, "Failed to update ResourceExport", "resourceexport", resNamespaced.String()) return err } }