Merge pull request #25 from bswartz/resource-version-check

Don't reprocess objects

Author: k8s-ci-robot

cmd/volume-data-source-validator/main.go

@@ -46,10 +46,9 @@ import (
 
 // Command line flags
 var (
-	kubeconfig   = flag.String("kubeconfig", "", "Absolute path to the kubeconfig file. Required only when running out of cluster.")
-	resyncPeriod = flag.Duration("resync-period", 60*time.Second, "Resync interval of the controller.")
-	showVersion  = flag.Bool("version", false, "Show version.")
-	threads      = flag.Int("worker-threads", 10, "Number of worker threads.")
+	kubeconfig  = flag.String("kubeconfig", "", "Absolute path to the kubeconfig file. Required only when running out of cluster.")
+	showVersion = flag.Bool("version", false, "Show version.")
+	threads     = flag.Int("worker-threads", 10, "Number of worker threads.")
 
 	leaderElection              = flag.Bool("leader-election", false, "Enables leader election.")
 	leaderElectionNamespace     = flag.String("leader-election-namespace", "", "The namespace where the leader election resource exists. Defaults to the pod namespace if not set.")
@@ -94,8 +93,8 @@ func main() {
 		klog.Fatalf("Failed to create dynamic client: %v", err)
 	}
 
-	coreFactory := coreinformers.NewSharedInformerFactory(kubeClient, *resyncPeriod)
-	dynFactory := dynamicinformer.NewDynamicSharedInformerFactory(dynClient, *resyncPeriod)
+	coreFactory := coreinformers.NewSharedInformerFactory(kubeClient, 0)
+	dynFactory := dynamicinformer.NewDynamicSharedInformerFactory(dynClient, 0)
 
 	// Create and register metrics manager
 	metricsManager := metrics.NewMetricsManager()
@@ -112,15 +111,14 @@ func main() {
 	}
 	popv1beta1.AddToScheme(scheme.Scheme)
 
-	klog.V(2).Infof("Start NewDataSourceValidator with kubeconfig [%s] resyncPeriod [%+v]", *kubeconfig, *resyncPeriod)
+	klog.V(2).Infof("Start NewDataSourceValidator with kubeconfig [%s]", *kubeconfig)
 
 	ctrl := popcontroller.NewDataSourceValidator(
 		dynClient,
 		kubeClient,
 		dynFactory.ForResource(popcontroller.PopulatorResource).Informer(),
 		coreFactory.Core().V1().PersistentVolumeClaims(),
 		metricsManager,
-		*resyncPeriod,
 	)
 
 	run := func(context.Context) {

pkg/data-source-validator/data_source_validator.go

@@ -18,8 +18,9 @@ package data_source_validator
 
 import (
 	"fmt"
-	"time"
 
+	volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
+	popv1beta1 "github.com/kubernetes-csi/volume-data-source-validator/client/apis/volumepopulator/v1beta1"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -39,9 +40,6 @@ import (
 	"k8s.io/client-go/util/workqueue"
 	"k8s.io/klog/v2"
 
-	volumesnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v4/apis/volumesnapshot/v1"
-
-	popv1beta1 "github.com/kubernetes-csi/volume-data-source-validator/client/apis/volumepopulator/v1beta1"
 	"github.com/kubernetes-csi/volume-data-source-validator/pkg/metrics"
 )
 
@@ -57,8 +55,6 @@ type populatorController struct {
 	pvcListerSynced cache.InformerSynced
 
 	metrics metrics.MetricsManager
-
-	resyncPeriod time.Duration
 }
 
 var (
@@ -74,7 +70,6 @@ func NewDataSourceValidator(
 	volumePopulatorInformer cache.SharedIndexInformer,
 	pvcInformer coreinformers.PersistentVolumeClaimInformer,
 	metrics metrics.MetricsManager,
-	resyncPeriod time.Duration,
 ) *populatorController {
 	broadcaster := record.NewBroadcaster()
 	broadcaster.StartLogging(klog.Infof)
@@ -87,17 +82,15 @@ func NewDataSourceValidator(
 		client:        client,
 		eventRecorder: eventRecorder,
 		metrics:       metrics,
-		resyncPeriod:  resyncPeriod,
 		queue:         workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "pvc"),
 	}
 
-	pvcInformer.Informer().AddEventHandlerWithResyncPeriod(
+	pvcInformer.Informer().AddEventHandler(
 		cache.ResourceEventHandlerFuncs{
-			AddFunc:    func(obj interface{}) { ctrl.enqueueWork(obj) },
+			AddFunc:    ctrl.enqueueWork,
 			UpdateFunc: func(oldObj, newObj interface{}) { ctrl.enqueueWork(newObj) },
-			DeleteFunc: func(obj interface{}) { ctrl.enqueueWork(obj) },
+			DeleteFunc: ctrl.enqueueWork,
 		},
-		ctrl.resyncPeriod,
 	)
 	ctrl.pvcLister = pvcInformer.Lister()
 	ctrl.pvcListerSynced = pvcInformer.Informer().HasSynced