fix the lint eror

Signed-off-by: Ryan Zhang <yangzhangrice@hotmail.com>

Author: ryanzhang-oss

pkg/propertyprovider/azure/controllers/node.go

@@ -26,9 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/klog/v2"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
 	"github.com/kubefleet-dev/kubefleet/pkg/propertyprovider/azure/trackers"
 )
@@ -95,6 +93,6 @@ func (r *NodeReconciler) SetupWithManager(mgr ctrl.Manager, controllerName strin
 	// Reconcile any node changes (create, update, delete).
 	return ctrl.NewControllerManagedBy(mgr).
 		Named(controllerName).
-		For(&corev1.Node{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
+		For(&corev1.Node{}).
 		Complete(r)
 }

pkg/propertyprovider/azure/provider.go

@@ -473,16 +473,13 @@ func (p *PropertyProvider) collectK8sVersion(_ context.Context, properties map[c
 	// Check if we have a cached version that is still valid.
 	p.k8sVersionMutex.RLock()
 	if p.cachedK8sVersion != "" && now.Sub(p.cachedK8sVersionObservedTime) < k8sVersionCacheTTL {
+		defer p.k8sVersionMutex.RUnlock()
 		// Cache is still valid, use the cached version.
-		cachedVersion := p.cachedK8sVersion
-		cacheTime := p.cachedK8sVersionObservedTime
-		p.k8sVersionMutex.RUnlock()
-
 		properties[propertyprovider.K8sVersionProperty] = clusterv1beta1.PropertyValue{
-			Value:           cachedVersion,
-			ObservationTime: metav1.NewTime(cacheTime),
+			Value:           p.cachedK8sVersion,
+			ObservationTime: metav1.NewTime(p.cachedK8sVersionObservedTime),
 		}
-		klog.V(2).InfoS("Using cached Kubernetes version", "version", cachedVersion, "cacheAge", now.Sub(cacheTime))
+		klog.V(2).InfoS("Using cached Kubernetes version", "version", p.cachedK8sVersion, "cacheAge", now.Sub(p.cachedK8sVersionObservedTime))
 		return
 	}
 	p.k8sVersionMutex.RUnlock()

pkg/propertyprovider/azure/provider_integration_test.go

@@ -39,8 +39,8 @@ import (
 
 var (
 	ignoreObservationTimeFieldInPropertyValue = cmpopts.IgnoreFields(clusterv1beta1.PropertyValue{}, "ObservationTime")
-	ignoreK8sVersionProperty                  = cmpopts.IgnoreMapEntries(func(k clusterv1beta1.PropertyName, v clusterv1beta1.PropertyValue) bool {
-		return k == propertyprovider.K8sVersionProperty
+	ignoreNonDeterministicProperty            = cmpopts.IgnoreMapEntries(func(k clusterv1beta1.PropertyName, v clusterv1beta1.PropertyValue) bool {
+		return k == propertyprovider.K8sVersionProperty || k == propertyprovider.ClusterEntryPointProperty
 	})
 )
 
@@ -314,7 +314,7 @@ var (
 			}
 
 			res := p.Collect(ctx)
-			if diff := cmp.Diff(res, expectedRes, ignoreObservationTimeFieldInPropertyValue, ignoreK8sVersionProperty, cmpopts.EquateEmpty()); diff != "" {
+			if diff := cmp.Diff(res, expectedRes, ignoreObservationTimeFieldInPropertyValue, ignoreNonDeterministicProperty, cmpopts.EquateEmpty()); diff != "" {
 				return fmt.Errorf("property collection response (-got, +want):\n%s", diff)
 			}
 			return nil

pkg/propertyprovider/azure/provider_test.go

@@ -949,10 +949,14 @@ func TestCollectWithDisabledFeatures(t *testing.T) {
 				isAvailableResourcesCollectionEnabled: tc.isAvailableResourcesCollectionEnabled,
 				cachedK8sVersion:                      k8sversion,
 				cachedK8sVersionObservedTime:          time.Now(),
+				clusterEntryPoint:                     "test-cluster",
 			}
 			tc.wantPropertyCollectionResponse.Properties[propertyprovider.K8sVersionProperty] = clusterv1beta1.PropertyValue{
 				Value: k8sversion,
 			}
+			tc.wantPropertyCollectionResponse.Properties[propertyprovider.ClusterEntryPointProperty] = clusterv1beta1.PropertyValue{
+				Value: "test-cluster",
+			}
 			res := p.Collect(ctx)
 			if diff := cmp.Diff(res, tc.wantPropertyCollectionResponse, ignoreObservationTimeFieldInPropertyValue); diff != "" {
 				t.Fatalf("Collect() property collection response diff (-got, +want):\n%s", diff)

pkg/scheduler/scheduler.go

@@ -100,6 +100,8 @@ func NewScheduler(
 
 // ScheduleOnce performs scheduling for one single item pulled from the work queue.
 // it returns true if the context is not canceled, false otherwise.
+//
+//lint:ignore SA1019 we need more time to fully migrate to RequeueAfter as we used these two fields separately.
 func (s *Scheduler) scheduleOnce(ctx context.Context, worker int) {
 	// Retrieve the next item (name of a placement) from the work queue.
 	//
@@ -228,7 +230,6 @@ func (s *Scheduler) scheduleOnce(ctx context.Context, worker int) {
 	}
 
 	// Requeue if the scheduling cycle suggests so.
-	//lint:ignore SA1019 we need more time to fully migrate to RequeueAfter as we used these two fields separately.
 	if res.Requeue {
 		if res.RequeueAfter > 0 {
 			s.queue.AddAfter(placementKey, res.RequeueAfter)

pkg/utils/controller/controller.go

@@ -260,6 +260,7 @@ func (w *controller) processNextWorkItem(ctx context.Context) bool {
 	return true
 }
 
+//lint:ignore SA1019 we need more time to fully migrate to RequeueAfter as we used these two fields separately.
 func (w *controller) reconcileHandler(ctx context.Context, key interface{}) {
 	// Update metrics after processing each item
 	reconcileStartTS := time.Now()
@@ -284,7 +285,7 @@ func (w *controller) reconcileHandler(ctx context.Context, key interface{}) {
 		w.queue.Forget(key)
 		w.queue.AddAfter(key, result.RequeueAfter)
 		metrics.FleetReconcileTotal.WithLabelValues(w.name, labelRequeueAfter).Inc()
-	case result.RequeueAfter > 0:
+	case result.Requeue:
 		w.queue.AddRateLimited(key)
 		metrics.FleetReconcileTotal.WithLabelValues(w.name, labelRequeue).Inc()
 	default:

test/e2e/utils_test.go

@@ -312,10 +312,15 @@ func checkIfAzurePropertyProviderIsWorking() {
 			ignoreCostProperties := cmpopts.IgnoreMapEntries(func(k clusterv1beta1.PropertyName, v clusterv1beta1.PropertyValue) bool {
 				return k == azure.PerCPUCoreCostProperty || k == azure.PerGBMemoryCostProperty
 			})
+			// we don't know the exact value of k8s version and cluster entry point
+			ignoreClusterProperties := cmpopts.IgnoreMapEntries(func(k clusterv1beta1.PropertyName, v clusterv1beta1.PropertyValue) bool {
+				return k == propertyprovider.K8sVersionProperty || k == propertyprovider.ClusterEntryPointProperty
+			})
 			if diff := cmp.Diff(
 				mcObj.Status.Properties, wantStatus.Properties,
 				ignoreTimeTypeFields,
 				ignoreCostProperties,
+				ignoreClusterProperties,
 			); diff != "" {
 				return fmt.Errorf("member cluster status properties diff (-got, +want):\n%s", diff)
 			}
@@ -576,7 +581,7 @@ func cleanupInvalidClusters() {
 		}
 		Eventually(func() error {
 			err := hubClient.Get(ctx, types.NamespacedName{Name: name}, mcObj)
-			if err != nil {
+			if err != nil && !k8serrors.IsNotFound(err) {
 				return err
 			}
 			mcObj.Finalizers = []string{}