use configmapsleases for leader election

kubeovn · May 13, 2022 · 0c25d8e · 0c25d8e
1 parent 673138f
commit 0c25d8e
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 5 deletions.
diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -1468,6 +1468,12 @@ rules:
       - create
       - patch
       - update
+  - apiGroups:
+      - coordination.k8s.io
+    resources:
+      - leases
+    verbs:
+      - "*"
   - apiGroups:
       - "k8s.cni.cncf.io"
     resources:
@@ -1955,6 +1961,12 @@ rules:
       - create
       - patch
       - update
+  - apiGroups:
+      - coordination.k8s.io
+    resources:
+      - leases
+    verbs:
+      - "*"
   - apiGroups:
       - "k8s.cni.cncf.io"
     resources:

diff --git a/pkg/controller/election.go b/pkg/controller/election.go
@@ -5,7 +5,6 @@ import (
 	"os"
 	"time"
 
-	"github.com/kubeovn/kube-ovn/pkg/util"
 	apiv1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	clientset "k8s.io/client-go/kubernetes"
@@ -14,6 +13,8 @@ import (
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/klog/v2"
+
+	"github.com/kubeovn/kube-ovn/pkg/util"
 )
 
 const ovnLeaderElector = "ovn-controller-leader-elector"
@@ -107,18 +108,28 @@ func setupLeaderElection(config *leaderElectionConfig) *leaderelection.LeaderEle
 		Host:      hostname,
 	})
 
-	lock := resourcelock.ConfigMapLock{
+	leaseLock := &resourcelock.LeaseLock{
+		LeaseMeta: metav1.ObjectMeta{Namespace: config.PodNamespace, Name: config.ElectionID},
+		Client:    config.Client.CoordinationV1(),
+		LockConfig: resourcelock.ResourceLockConfig{
+			Identity:      config.PodName,
+			EventRecorder: recorder,
+		},
+	}
+	cmLock := &resourcelock.ConfigMapLock{
 		ConfigMapMeta: metav1.ObjectMeta{Namespace: config.PodNamespace, Name: config.ElectionID},
 		Client:        config.Client.CoreV1(),
 		LockConfig: resourcelock.ResourceLockConfig{
 			Identity:      config.PodName,
 			EventRecorder: recorder,
 		},
 	}
+	lock := resourcelock.MultiLock{
+		Primary:   leaseLock,
+		Secondary: cmLock,
+	}
 
-	var err error
-
-	elector, err = leaderelection.NewLeaderElector(leaderelection.LeaderElectionConfig{
+	elector, err := leaderelection.NewLeaderElector(leaderelection.LeaderElectionConfig{
 		Lock:          &lock,
 		LeaseDuration: 15 * time.Second,
 		RenewDeadline: 10 * time.Second,

diff --git a/yamls/ovn-dpdk.yaml b/yamls/ovn-dpdk.yaml
@@ -123,6 +123,12 @@ rules:
       - create
       - patch
       - update
+  - apiGroups:
+      - coordination.k8s.io
+    resources:
+      - leases
+    verbs:
+      - "*"
   - apiGroups:
       - "k8s.cni.cncf.io"
     resources:

diff --git a/yamls/ovn-ha.yaml b/yamls/ovn-ha.yaml
@@ -126,6 +126,12 @@ rules:
       - create
       - patch
       - update
+  - apiGroups:
+      - coordination.k8s.io
+    resources:
+      - leases
+    verbs:
+      - "*"
   - apiGroups:
       - "k8s.cni.cncf.io"
     resources:

diff --git a/yamls/ovn.yaml b/yamls/ovn.yaml
@@ -136,6 +136,12 @@ rules:
       - create
       - patch
       - update
+  - apiGroups:
+      - coordination.k8s.io
+    resources:
+      - leases
+    verbs:
+      - "*"
   - apiGroups:
       - "k8s.cni.cncf.io"
     resources: