Workarounds to pass e2e tests

Author: Richard Kovacs

deploy/ccm-linode-template.yaml

@@ -22,7 +22,7 @@ metadata:
 rules:
 - apiGroups: [""]
   resources: ["endpoints"]
-  verbs: ["get", "watch", "list", "update", "create"]
+  verbs: ["get"]
 - apiGroups: [""]
   resources: ["nodes"]
   verbs: ["get", "watch", "list", "update", "delete", "patch"]
@@ -44,6 +44,9 @@ rules:
 - apiGroups: [""]
   resources: ["services/status"]
   verbs: ["get", "watch", "list", "update", "patch"]
+- apiGroups: ["coordination.k8s.io"]
+  resources: ["leases"]
+  verbs: ["get", "watch", "list", "update", "create"]
 ---
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
@@ -101,9 +104,8 @@ spec:
           imagePullPolicy: Always
           name: ccm-linode
           args:
-          - --leader-elect-resource-lock=endpoints
+          - --leader-elect-resource-lock=leases
           - --v=3
-          - --port=0
           - --secure-port=10253
           volumeMounts:
           - mountPath: /etc/kubernetes

deploy/chart/templates/clusterrole-rbac.yaml

@@ -5,7 +5,7 @@ metadata:
 rules:
   - apiGroups: [""]
     resources: ["endpoints"]
-    verbs: ["get", "watch", "list", "update", "create"]
+    verbs: ["get"]
   - apiGroups: ["coordination.k8s.io"]
     resources: ["leases"]
     verbs: ["get", "watch", "list", "update", "create"]
@@ -30,3 +30,6 @@ rules:
   - apiGroups: [""]
     resources: ["services/status"]
     verbs: ["get", "watch", "list", "update", "patch"]
+  - apiGroups: ["coordination.k8s.io"]
+    resources: ["leases"]
+    verbs: ["get", "watch", "list", "update", "create"]

e2e/test/ccm_e2e_test.go

@@ -61,7 +61,7 @@ var _ = Describe("e2e tests", func() {
 		f = root.Invoke()
 		workers, err = f.GetWorkerNodeList()
 		Expect(err).NotTo(HaveOccurred())
-		Expect(len(workers)).Should(BeNumerically(">=", 2))
+		Expect(workers).Should(HaveLen(2))
 	})
 
 	createPodWithLabel := func(pods []string, ports []core.ContainerPort, image string, labels map[string]string, selectNode bool) {