build: fix 'make check' errors with go1.18.2

Fixed minor lint errors when compiling the code with go1.18.2 (amd64,
RHEL8).

Signed-off-by: Shachar Sharon <[email protected]>

Author: synarete

controllers/smbshare_controller.go

@@ -62,7 +62,8 @@ func (r *SmbShareReconciler) Reconcile(
 	reqLogger.Info("Reconciling SmbShare")
 
 	smbShareManager := resources.NewSmbShareManager(
-		r, r.Scheme(), r.recorder, reqLogger)
+		r, r.Scheme(), r.recorder, reqLogger) // nolint:typecheck
+
 	res := smbShareManager.Process(ctx, req.NamespacedName)
 	err := res.Err()
 	if res.Requeue() {
@@ -72,9 +73,7 @@ func (r *SmbShareReconciler) Reconcile(
 }
 
 func (r *SmbShareReconciler) setRecorder(mgr ctrl.Manager) {
-	if r.recorder == nil {
-		r.recorder = mgr.GetEventRecorderFor("smbshare-controller")
-	}
+	r.recorder = mgr.GetEventRecorderFor("smbshare-controller")
 }
 
 // SetupWithManager sets up resource management.

internal/resources/smbshare.go

@@ -25,7 +25,7 @@ import (
 	kresource "k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/types" // nolint:typecheck
 	"k8s.io/client-go/tools/record"
 	rtclient "sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

tests/utils/kube/dynamic.go

@@ -11,7 +11,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/types" // nolint:typecheck
 	"k8s.io/apimachinery/pkg/util/yaml"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/discovery/cached/memory"

tests/utils/kube/status.go

@@ -119,7 +119,7 @@ func WaitForAnyPodReady(
 		tc:        tc,
 		fetchOpts: fo,
 	}
-	pp.Cond = func() (bool, error) { return pp.checkReady(ctx) }
+	pp.Prober.Cond = func() (bool, error) { return pp.checkReady(ctx) }
 	return poll.TryUntil(ctx, pp)
 }
 
@@ -133,7 +133,7 @@ func WaitForAllPodReady(
 		tc:        tc,
 		fetchOpts: fo,
 	}
-	pp.Cond = func() (bool, error) { return pp.checkAllReady(ctx) }
+	pp.Prober.Cond = func() (bool, error) { return pp.checkAllReady(ctx) }
 	return poll.TryUntil(ctx, pp)
 }
 
@@ -147,6 +147,6 @@ func WaitForAnyPodExists(
 		tc:        tc,
 		fetchOpts: fo,
 	}
-	pp.Cond = func() (bool, error) { return pp.checkExists(ctx) }
+	pp.Prober.Cond = func() (bool, error) { return pp.checkExists(ctx) }
 	return poll.TryUntil(ctx, pp)
 }