Merge pull request #50 from ConnorJC3/fix-controller-regain-lease

Create ModifyController on demand in main.go

Author: torredil

.github/workflows/build.yml

@@ -8,11 +8,11 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
           go-version: '>=1.20'
       - run: make
-      - run: make test
+      - run: make test

cmd/main.go

@@ -95,7 +95,6 @@ func main() {
 		klog.Fatal(err.Error())
 	}
 
-	informerFactory := informers.NewSharedInformerFactory(kubeClient, *resyncPeriod)
 	mux := http.NewServeMux()
 	metricsManager := metrics.NewCSIMetricsManager("" /* driverName */)
 	csiClient, err := csi.New(*csiAddress, *timeout, metricsManager)
@@ -135,15 +134,17 @@ func main() {
 	}
 
 	modifierName := csiModifier.Name()
-	mc := controller.NewModifyController(
-		modifierName,
-		csiModifier,
-		kubeClient,
-		*resyncPeriod,
-		informerFactory,
-		workqueue.NewItemExponentialFailureRateLimiter(*retryIntervalStart, *retryIntervalMax),
-		true, /* retryFailure */
-	)
+	mc := func() controller.ModifyController {
+		return controller.NewModifyController(
+			modifierName,
+			csiModifier,
+			kubeClient,
+			*resyncPeriod,
+			informers.NewSharedInformerFactory(kubeClient, *resyncPeriod),
+			workqueue.NewItemExponentialFailureRateLimiter(*retryIntervalStart, *retryIntervalMax),
+			true, /* retryFailure */
+		)
+	}
 	leaseChannel := make(chan *v1.Lease)
 	go leaseHandler(podName, mc, leaseChannel)
 
@@ -162,12 +163,11 @@ func main() {
 			}
 		},
 	})
-	informerFactory.Start(wait.NeverStop)
 	informerFactoryLeases.Start(wait.NeverStop)
 	leaseInformer.Run(wait.NeverStop)
 }
 
-func leaseHandler(podName string, mc controller.ModifyController, leaseChannel chan *v1.Lease) {
+func leaseHandler(podName string, mc func() controller.ModifyController, leaseChannel chan *v1.Lease) {
 	var cancel context.CancelFunc = nil
 
 	klog.InfoS("leaseHandler: Looking for external-resizer lease holder")
@@ -191,7 +191,7 @@ func leaseHandler(podName string, mc controller.ModifyController, leaseChannel c
 				var ctx context.Context
 				ctx, cancel = context.WithCancel(context.Background())
 				klog.InfoS("leaseHandler: Starting ModifyController", "podName", podName, "currentLeader", currentLeader)
-				go mc.Run(*workers, ctx)
+				go mc().Run(*workers, ctx)
 			} else if currentLeader != podName && cancel != nil {
 				klog.InfoS("leaseHandler: Stopping ModifyController", "podName", podName, "currentLeader", currentLeader)
 				cancel()

cmd/main_test.go

@@ -77,7 +77,7 @@ func TestLeaseHandler_PodRegainsLeadership(t *testing.T) {
 	leaseChannel := make(chan *v1.Lease, 3)
 	defer close(leaseChannel)
 
-	go leaseHandler("test-pod", mockModifyController, leaseChannel)
+	go leaseHandler("test-pod", func() controller.ModifyController { return mockModifyController }, leaseChannel)
 
 	// Become the leader
 	leaseChannel <- newLease("external-resizer-ebs-csi-aws-com", "test-pod")
@@ -113,7 +113,7 @@ func TestLeaseHandler_RunCalledOnce(t *testing.T) {
 	leaseChannel := make(chan *v1.Lease, 3)
 	defer close(leaseChannel)
 
-	go leaseHandler("test-pod", mockModifyController, leaseChannel)
+	go leaseHandler("test-pod", func() controller.ModifyController { return mockModifyController }, leaseChannel)
 
 	for i := 0; i < 10; i++ {
 		leaseChannel <- newLease("external-resizer-ebs-csi-aws-com", "test-pod")
@@ -140,7 +140,7 @@ func newLease(name, holderIdentity string) *v1.Lease {
 
 func runLeaseHandlerAndSendLease(t *testing.T, podName string, mockModifyController *controller.MockModifyController, lease *v1.Lease) {
 	leaseChannel := make(chan *v1.Lease, 1)
-	go leaseHandler(podName, mockModifyController, leaseChannel)
+	go leaseHandler(podName, func() controller.ModifyController { return mockModifyController }, leaseChannel)
 	leaseChannel <- lease
 	close(leaseChannel)
 }

pkg/controller/controller.go

@@ -65,6 +65,7 @@ func NewModifyController(
 		UpdateFunc: ctrl.updatePVC,
 		DeleteFunc: ctrl.deletePVC,
 	}, resyncPeriod)
+	informerFactory.Start(wait.NeverStop)
 
 	return ctrl
 }
@@ -366,13 +367,13 @@ func (c *modifyController) needsProcessing(old *v1.PersistentVolumeClaim, new *v
 	}
 
 	annotations := make(map[string]struct{})
-	for key, _ := range new.Annotations {
+	for key := range new.Annotations {
 		if c.isValidAnnotation(key) {
 			annotations[key] = struct{}{}
 		}
 	}
 
-	for a, _ := range annotations {
+	for a := range annotations {
 		oldValue := old.Annotations[a]
 		newValue := new.Annotations[a]