chore: Fix golangci-lint issues

jimmidyson · jimmidyson · commit 00d3951c36a0 · 2020-07-02T17:55:50.000+01:00
diff --git a/pkg/controller/kubefedcluster/clusterclient.go b/pkg/controller/kubefedcluster/clusterclient.go
@@ -71,7 +71,7 @@ func NewClusterClientSet(c *fedv1b1.KubeFedCluster, client generic.Client, fedNa
 	if err != nil {
 		return nil, err
 	}
-	clusterConfig.Timeout = timeout
+	clusterConfig.Timeout = timeout //nolint:staticcheck
 	var clusterClientSet = ClusterClient{clusterName: c.Name}
 	if clusterConfig != nil {
 		clusterClientSet.kubeClient = kubeclientset.NewForConfigOrDie((restclient.AddUserAgent(clusterConfig, UserAgentName)))
diff --git a/pkg/controller/kubefedcluster/controller.go b/pkg/controller/kubefedcluster/controller.go
@@ -18,7 +18,6 @@ package kubefedcluster
 
 import (
 	"context"
-	"fmt"
 	"sync"
 	"time"
 
@@ -111,7 +110,7 @@ func newClusterController(config *util.ControllerConfig, clusterHealthCheckConfi
 	kubeClient := kubeclient.NewForConfigOrDie(kubeConfig)
 	broadcaster := record.NewBroadcaster()
 	broadcaster.StartRecordingToSink(&typedcorev1.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")})
-	recorder := broadcaster.NewRecorder(genscheme.Scheme, corev1.EventSource{Component: fmt.Sprintf("kubefedcluster-controller")})
+	recorder := broadcaster.NewRecorder(genscheme.Scheme, corev1.EventSource{Component: "kubefedcluster-controller"})
 	cc.eventRecorder = recorder
 
 	var err error
diff --git a/pkg/controller/schedulingpreference/controller.go b/pkg/controller/schedulingpreference/controller.go
@@ -78,7 +78,7 @@ func StartSchedulingPreferenceController(config *util.ControllerConfig, scheduli
 	if config.MinimizeLatency {
 		controller.minimizeLatency()
 	}
-	klog.Infof(fmt.Sprintf("Starting replicaschedulingpreferences controller"))
+	klog.Infof("Starting replicaschedulingpreferences controller")
 	controller.Run(stopChannel)
 	return controller.scheduler, nil
 }
@@ -95,7 +95,7 @@ func newSchedulingPreferenceController(config *util.ControllerConfig, scheduling
 
 	broadcaster := record.NewBroadcaster()
 	broadcaster.StartRecordingToSink(&typedcorev1.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")})
-	recorder := broadcaster.NewRecorder(scheme.Scheme, corev1.EventSource{Component: fmt.Sprintf("replicaschedulingpreference-controller")})
+	recorder := broadcaster.NewRecorder(scheme.Scheme, corev1.EventSource{Component: "replicaschedulingpreference-controller"})
 
 	s := &SchedulingPreferenceController{
 		clusterAvailableDelay:   config.ClusterAvailableDelay,
diff --git a/pkg/controller/sync/version/manager.go b/pkg/controller/sync/version/manager.go
@@ -88,10 +88,7 @@ func (m *VersionManager) Sync(stopChan <-chan struct{}) {
 	if !ok {
 		return
 	}
-	ok = m.load(versionList, stopChan)
-	if !ok {
-		return
-	}
+	m.load(versionList, stopChan)
 }
 
 // HasSynced indicates whether the manager's in-memory state has been

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func NewClusterClientSet(c *fedv1b1.KubeFedCluster, client generic.Client, fedNa`
`71`	`71`	`if err != nil {`
`72`	`72`	`return nil, err`
`73`	`73`	`}`
`74`		`- clusterConfig.Timeout = timeout`
	`74`	`+ clusterConfig.Timeout = timeout //nolint:staticcheck`
`75`	`75`	`var clusterClientSet = ClusterClient{clusterName: c.Name}`
`76`	`76`	`if clusterConfig != nil {`
`77`	`77`	`clusterClientSet.kubeClient = kubeclientset.NewForConfigOrDie((restclient.AddUserAgent(clusterConfig, UserAgentName)))`
Original file line number	Diff line number	Diff line change
`@@ -88,10 +88,7 @@ func (m *VersionManager) Sync(stopChan <-chan struct{}) {`
`88`	`88`	`if !ok {`
`89`	`89`	`return`
`90`	`90`	`}`
`91`		`- ok = m.load(versionList, stopChan)`
`92`		`- if !ok {`
`93`		`- return`
`94`		`- }`
	`91`	`+ m.load(versionList, stopChan)`
`95`	`92`	`}`
`96`	`93`
`97`	`94`	`// HasSynced indicates whether the manager's in-memory state has been`