Add rule for network attachment definition objects in clusterrole

cni-genie · Dec 18, 2018 · b50cc56 · b50cc56
1 parent 4318334
commit b50cc56
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 24 deletions.
diff --git a/conf/1.8/genie-complete.yaml b/conf/1.8/genie-complete.yaml
@@ -28,6 +28,13 @@ rules:
       - get
       - update
       - patch
+  - apiGroups:
+      - "k8s.cni.cncf.io"
+    resources:
+      - network-attachment-definitions
+    verbs:
+      - get
+      - update
   - apiGroups:
       - ""
     resources:
@@ -158,18 +165,6 @@ spec:
         k8s-app: genie
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
-        scheduler.alpha.kubernetes.io/tolerations: |
-          [
-            {
-              "key": "dedicated",
-              "value": "master",
-              "effect": "NoSchedule"
-            },
-            {
-              "key": "CriticalAddonsOnly",
-              "operator": "Exists"
-            }
-          ]
     spec:
       hostNetwork: true
       hostPID: true
@@ -197,6 +192,12 @@ spec:
               name: cni-bin-dir
             - mountPath: /host/etc/cni/net.d
               name: cni-net-dir
+      tolerations:
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - key: node.kubernetes.io/not-ready
+        effect: NoSchedule
+        operator: Exists
       volumes:
         - name: cni-bin-dir
           hostPath:
@@ -224,6 +225,9 @@ spec:
       tolerations:
       - key: node-role.kubernetes.io/master
         effect: NoSchedule
+      - key: node.kubernetes.io/not-ready
+        effect: NoSchedule
+        operator: Exists
       - key: CriticalAddonsOnly
         operator: Exists
       nodeSelector:

diff --git a/conf/1.8/genie-plugin.yaml b/conf/1.8/genie-plugin.yaml
@@ -28,6 +28,13 @@ rules:
       - get
       - update
       - patch
+  - apiGroups:
+      - "k8s.cni.cncf.io"
+    resources:
+      - network-attachment-definitions
+    verbs:
+      - get
+      - update
   - apiGroups:
       - ""
     resources:
@@ -115,18 +122,6 @@ spec:
         k8s-app: genie
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
-        scheduler.alpha.kubernetes.io/tolerations: |
-          [
-            {
-              "key": "dedicated",
-              "value": "master",
-              "effect": "NoSchedule"
-            },
-            {
-              "key": "CriticalAddonsOnly",
-              "operator": "Exists"
-            }
-          ]
     spec:
       hostNetwork: true
       hostPID: true
@@ -154,6 +149,12 @@ spec:
               name: cni-bin-dir
             - mountPath: /host/etc/cni/net.d
               name: cni-net-dir
+      tolerations:
+      - key: CriticalAddonsOnly
+        operator: Exists
+      - key: node.kubernetes.io/not-ready
+        effect: NoSchedule
+        operator: Exists
       volumes:
         - name: cni-bin-dir
           hostPath:
@@ -181,6 +182,9 @@ spec:
       tolerations:
       - key: node-role.kubernetes.io/master
         effect: NoSchedule
+      - key: node.kubernetes.io/not-ready
+        effect: NoSchedule
+        operator: Exists
       - key: CriticalAddonsOnly
         operator: Exists
       nodeSelector: