Merge pull request #160 from oracle/ap/fix-98

Migrate to configmap based leader election

Author: jhorwit2

Makefile

@@ -90,11 +90,12 @@ deploy:
 
 .PHONY: run-dev
 run-dev: build
-	@dist/oci-cloud-controller-manager        \
-	    --kubeconfig=${KUBECONFIG}           \
-	    --cloud-config=${CLOUD_PROVIDER_CFG} \
-	    --cluster-cidr=10.244.0.0/16         \
-	    --cloud-provider=oci                 \
+	@dist/oci-cloud-controller-manager          \
+	    --kubeconfig=${KUBECONFIG}              \
+	    --cloud-config=${CLOUD_PROVIDER_CFG}    \
+	    --cluster-cidr=10.244.0.0/16            \
+	    --leader-elect-resource-lock=configmaps \
+	    --cloud-provider=oci                    \
 	    -v=4
 
 .PHONY: version

manifests/oci-cloud-controller-manager-rbac.yaml

@@ -12,14 +12,14 @@ rules:
   - nodes
   verbs:
   - '*'
- 
+
 - apiGroups:
   - ""
   resources:
   - nodes/status
   verbs:
   - patch
-  
+
 - apiGroups:
   - ""
   resources:
@@ -52,10 +52,36 @@ rules:
   - endpoints
   verbs:
   - create
+
+- apiGroups:
+  - ""
+  resources:
+  - endpoints
+  resourceNames:
+  - "cloud-controller-manager"
+  verbs:
   - get
   - list
   - watch
   - update
+
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - create
+
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  resourceNames:
+  - "cloud-controller-manager"
+  verbs:
+  - get
+  - update
+
 - apiGroups:
   - ""
   resources:

manifests/oci-cloud-controller-manager.yaml

@@ -41,6 +41,7 @@ spec:
             - --cloud-config=/etc/oci/cloud-provider.yaml
             - --cloud-provider=oci
             - --cluster-cidr=10.244.0.0/16
+            - --leader-elect-resource-lock=configmaps
             - -v=2
           volumeMounts:
             - name: cfg