Merge pull request #1 from fengzixu/fix-panic-bug

fix: fix the bug that cases panic of controller and agent
kubernetes-csi · Jun 28, 2020 · 2961012 · 2961012
2 parents 47ad009 + ef532c1
commit 2961012
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/deploy/kubernetes/external-health-monitor-agent/daemonset.yaml b/deploy/kubernetes/external-health-monitor-agent/daemonset.yaml
@@ -22,7 +22,6 @@ spec:
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
-            - "--leader-election"
           env:
             - name: MY_NAME
               valueFrom:
@@ -47,4 +46,4 @@ spec:
 
       volumes:
         - name: socket-dir
-          emptyDir:
+          emptyDir:
diff --git a/pkg/agent/pv_monitor_agent.go b/pkg/agent/pv_monitor_agent.go
@@ -100,7 +100,7 @@ func NewPVMonitorAgent(client kubernetes.Interface, driverName string, conn *grp
 
 	// PVC informer
 	agent.pvcLister = pvcInformer.Lister()
-	agent.pvListerSynced = pvcInformer.Informer().HasSynced
+	agent.pvcListerSynced = pvcInformer.Informer().HasSynced
 
 	// Pod informer
 	podInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{

diff --git a/pkg/controller/pv_monitor_controller.go b/pkg/controller/pv_monitor_controller.go
@@ -134,7 +134,7 @@ func NewPVMonitorController(client kubernetes.Interface, conn *grpc.ClientConn,
 
 	// PVC informer
 	ctrl.pvcLister = pvcInformer.Lister()
-	ctrl.pvListerSynced = pvcInformer.Informer().HasSynced
+	ctrl.pvcListerSynced = pvcInformer.Informer().HasSynced
 
 	// Pod informer
 	podInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{