Merge pull request #189 from hhyasdf/bugfix/add-leader-election-for-m…

…anager bugfix: add leader election for manager
alibaba · Mar 5, 2022 · da88868 · da88868
2 parents e9bdb94 + 9be0c4b
commit da88868
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -74,9 +74,12 @@ func main() {
 	signalContext := ctrl.SetupSignalHandler()
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		Scheme:             scheme,
-		Logger:             ctrl.Log.WithName("manager"),
-		MetricsBindAddress: fmt.Sprintf(":%d", metricsPort),
+		Scheme:                  scheme,
+		Logger:                  ctrl.Log.WithName("manager"),
+		MetricsBindAddress:      fmt.Sprintf(":%d", metricsPort),
+		LeaderElection:          true,
+		LeaderElectionID:        "hybridnet-manager-election",
+		LeaderElectionNamespace: os.Getenv("NAMESPACE"),
 	})
 	if err != nil {
 		entryLog.Error(err, "unable to start manager")

diff --git a/yamls/hybridnet-components.yaml b/yamls/hybridnet-components.yaml
@@ -179,6 +179,10 @@ spec:
           env:
             - name: DEFAULT_NETWORK_TYPE
               value: Overlay
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
       nodeSelector:
         node-role.kubernetes.io/master: ""
 

diff --git a/yamls/hybridnet-init.yaml b/yamls/hybridnet-init.yaml
@@ -103,6 +103,15 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - "coordination.k8s.io"
+    resources:
+      - leases
+    verbs:
+      - create
+      - get
+      - list
+      - update
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
@@ -3043,7 +3052,7 @@ spec:
     - jsonPath: .spec.range.gateway
       name: Gateway
       type: string
-    - jsonPath: .spec.range.networkType
+    - jsonPath: .spec.networkType
       name: NetworkType
       type: string
     - jsonPath: .spec.clusterName
@@ -3193,8 +3202,10 @@ spec:
                   type: string
                 type: array
               ip:
+                description: IP is the IP address of this VTEP.
                 type: string
               mac:
+                description: MAC is the MAC address of this VTEP.
                 type: string
               nodeName:
                 description: NodeName is the name of corresponding node in remote

diff --git a/yamls/rbac/rbac.yaml b/yamls/rbac/rbac.yaml
@@ -103,6 +103,15 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - "coordination.k8s.io"
+    resources:
+      - leases
+    verbs:
+      - create
+      - get
+      - list
+      - update
 
 ---
 apiVersion: rbac.authorization.k8s.io/v1