Merge pull request kubernetes-sigs#9446 from sbueringer/pr-add-loggercheck

k8s-ci-robot · web-flow · commit 90537d17d730 · 2023-09-18T06:54:31.000-07:00
🌱 Add loggercheck linter and fix findings
diff --git a/.golangci.yml b/.golangci.yml
@@ -36,6 +36,7 @@ linters:
   - govet
   - importas
   - ineffassign
+  - loggercheck
   - misspell
   - nakedret
   - nilerr
diff --git a/internal/controllers/machinedeployment/machinedeployment_rollout_ondelete.go b/internal/controllers/machinedeployment/machinedeployment_rollout_ondelete.go
@@ -106,7 +106,7 @@ func (r *Reconciler) reconcileOldMachineSetsOnDelete(ctx context.Context, oldMSs
 		}
 		selectorMap, err := metav1.LabelSelectorAsMap(&oldMS.Spec.Selector)
 		if err != nil {
-			log.V(4).Error(err, "failed to convert MachineSet %q label selector to a map", oldMS.Name)
+			log.V(4).Error(err, "failed to convert MachineSet label selector to a map")
 			continue
 		}
 		log.V(4).Info("Fetching Machines associated with MachineSet")
diff --git a/test/infrastructure/docker/internal/docker/manager.go b/test/infrastructure/docker/internal/docker/manager.go
@@ -172,7 +172,7 @@ func createNode(ctx context.Context, opts *nodeCreateOpts) (*types.Node, error)
 		}
 	}
 
-	log.V(6).Info("Container run options: %+v", runOptions)
+	log.V(6).Info(fmt.Sprintf("Container run options: %+v", runOptions))
 
 	containerRuntime, err := container.RuntimeFrom(ctx)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ func (r *Reconciler) reconcileOldMachineSetsOnDelete(ctx context.Context, oldMSs`
`106`	`106`	`}`
`107`	`107`	`selectorMap, err := metav1.LabelSelectorAsMap(&oldMS.Spec.Selector)`
`108`	`108`	`if err != nil {`
`109`		`- log.V(4).Error(err, "failed to convert MachineSet %q label selector to a map", oldMS.Name)`
	`109`	`+ log.V(4).Error(err, "failed to convert MachineSet label selector to a map")`
`110`	`110`	`continue`
`111`	`111`	`}`
`112`	`112`	`log.V(4).Info("Fetching Machines associated with MachineSet")`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ func createNode(ctx context.Context, opts nodeCreateOpts) (types.Node, error)`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`
`175`		`- log.V(6).Info("Container run options: %+v", runOptions)`
	`175`	`+ log.V(6).Info(fmt.Sprintf("Container run options: %+v", runOptions))`
`176`	`176`
`177`	`177`	`containerRuntime, err := container.RuntimeFrom(ctx)`
`178`	`178`	`if err != nil {`