use leases for leader election (#1529)

kubeovn · May 19, 2022 · 4f1e812 · 4f1e812
1 parent ae56306
commit 4f1e812
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 39 deletions.
diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -1358,14 +1358,6 @@ EOF
 
 if $DPDK; then
   cat <<EOF > ovn.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: ovn-config
-  namespace: kube-system
-data:
-  defaultNetworkType: '$NETWORK_TYPE'
-
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -1468,6 +1460,12 @@ rules:
       - create
       - patch
       - update
+  - apiGroups:
+      - coordination.k8s.io
+    resources:
+      - leases
+    verbs:
+      - "*"
   - apiGroups:
       - "k8s.cni.cncf.io"
     resources:
@@ -1856,13 +1854,6 @@ EOF
 
 else
   cat <<EOF > ovn.yaml
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: ovn-config
-  namespace: kube-system
-data:
-  defaultNetworkType: '$NETWORK_TYPE'
 ---
 apiVersion: v1
 kind: ServiceAccount
@@ -1955,6 +1946,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"
@@ -38,7 +39,7 @@ func (c *Controller) isLeader() bool {
 func (c *Controller) leaderElection() {
 	elector := setupLeaderElection(&leaderElectionConfig{
 		Client:       c.config.KubeClient,
-		ElectionID:   "ovn-config",
+		ElectionID:   "kube-ovn-controller",
 		PodName:      c.config.PodName,
 		PodNamespace: c.config.PodNamespace,
 	})
@@ -86,16 +87,16 @@ func setupLeaderElection(config *leaderElectionConfig) *leaderelection.LeaderEle
 		Component: ovnLeaderElector,
 		Host:      hostname,
 	})
-	lock := resourcelock.ConfigMapLock{
-		ConfigMapMeta: metav1.ObjectMeta{Namespace: config.PodNamespace, Name: config.ElectionID},
-		Client:        config.Client.CoreV1(),
+	lock := &resourcelock.LeaseLock{
+		LeaseMeta: metav1.ObjectMeta{Namespace: config.PodNamespace, Name: config.ElectionID},
+		Client:    config.Client.CoordinationV1(),
 		LockConfig: resourcelock.ResourceLockConfig{
 			Identity:      config.PodName,
 			EventRecorder: recorder,
 		},
 	}
 	elector, err := leaderelection.NewLeaderElector(leaderelection.LeaderElectionConfig{
-		Lock:          &lock,
+		Lock:          lock,
 		LeaseDuration: 15 * time.Second,
 		RenewDeadline: 10 * time.Second,
 		RetryPeriod:   2 * time.Second,

diff --git a/yamls/ovn-dpdk.yaml b/yamls/ovn-dpdk.yaml
@@ -27,15 +27,6 @@ spec:
     rule: 'RunAsAny'
 
 ---
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: ovn-config
-  namespace: kube-system
-data:
-  defaultNetworkType: geneve
----
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -123,6 +114,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
@@ -27,15 +27,6 @@ spec:
     rule: 'RunAsAny'
 
 ---
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: ovn-config
-  namespace: kube-system
-data:
-  defaultNetworkType: geneve
----
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -126,6 +117,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: