Merge pull request #1955 from destinyoooo/master

fix: format string issues

Author: sunsingerus

pkg/controller/chi/worker-deleter.go

@@ -382,7 +382,7 @@ func (w *worker) hasHostVolumesToRetain(ctx context.Context, host *api.Host) (ha
 	// Check whether among all PVCs host has reclaim policy "retain" specified
 	storage.NewStoragePVC(w.c.kube.Storage()).WalkDiscoveredPVCs(ctx, host, func(pvc *core.PersistentVolumeClaim) {
 		if chiLabeler.New(nil).GetReclaimPolicy(pvc.GetObjectMeta()) == api.PVCReclaimPolicyRetain {
-			w.a.V(1).F().Info("PVC: %s/%s blocks drop replica. Reclaim policy: %s", api.PVCReclaimPolicyRetain.String())
+			w.a.V(1).F().Info("PVC: %s/%s blocks drop replica. Reclaim policy: %s", pvc.Namespace, pvc.Name, api.PVCReclaimPolicyRetain.String())
 			has = true
 		}
 	})

pkg/controller/chi/worker-service.go

@@ -181,7 +181,7 @@ func (w *worker) updateService(
 			M(cr).F().
 			Info("Update Service success: %s", util.NamespaceNameString(newService))
 	} else {
-		w.a.M(cr).F().Error("Update Service fail: %s failed with error: %v", util.NamespaceNameString(newService))
+		w.a.M(cr).F().Error("Update Service fail: %s failed with error: %v", util.NamespaceNameString(newService), err)
 	}
 
 	return err

pkg/controller/chk/worker-service.go

@@ -181,7 +181,7 @@ func (w *worker) updateService(
 			M(cr).F().
 			Info("Update Service success: %s", util.NamespaceNameString(newService))
 	} else {
-		w.a.M(cr).F().Error("Update Service fail: %s failed with error: %v", util.NamespaceNameString(newService))
+		w.a.M(cr).F().Error("Update Service fail: %s failed with error: %v", util.NamespaceNameString(newService), err)
 	}
 
 	return err

pkg/model/k8s/service.go

@@ -27,7 +27,7 @@ func ServiceSpecVerifyPorts(spec *core.ServiceSpec) error {
 	for i := range spec.Ports {
 		servicePort := &spec.Ports[i]
 		if types.IsPortInvalid(servicePort.Port) {
-			return fmt.Errorf(fmt.Sprintf("incorrect port :%d", servicePort.Port))
+			return fmt.Errorf("incorrect port :%d", servicePort.Port)
 		}
 	}
 	return nil