Merge pull request #61 from leakingtapan/topology-test

Add missing capability and clusterrole permission to enable topology awareness scheduling
kubernetes-sigs · Oct 18, 2018 · 3188c64 · 3188c64
2 parents fa5a43c + 2873e0b
commit 3188c64
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/deploy/kubernetes/v1.12+/node.yaml b/deploy/kubernetes/v1.12+/node.yaml
@@ -27,6 +27,9 @@ rules:
   - apiGroups: ["storage.k8s.io"]
     resources: ["volumeattachments"]
     verbs: ["get", "list", "watch", "update"]
+  - apiGroups: ["csi.storage.k8s.io"]
+    resources: ["csinodeinfos"]
+    verbs: ["get", "list", "watch", "update"]
 
 ---
 

diff --git a/deploy/kubernetes/v1.12+/provisioner.yaml b/deploy/kubernetes/v1.12+/provisioner.yaml
@@ -15,6 +15,9 @@ rules:
   - apiGroups: [""]
     resources: ["secrets"]
     verbs: ["get", "list"]
+  - apiGroups: [""]
+    resources: ["nodes"]
+    verbs: ["get", "list", "watch"]
   - apiGroups: [""]
     resources: ["persistentvolumes"]
     verbs: ["get", "list", "watch", "create", "delete"]
@@ -36,6 +39,9 @@ rules:
   - apiGroups: ["snapshot.storage.k8s.io"]
     resources: ["volumesnapshotcontents"]
     verbs: ["get", "list"]
+  - apiGroups: ["csi.storage.k8s.io"]
+    resources: ["csinodeinfos"]
+    verbs: ["get", "list", "watch"]
 
 ---
 

diff --git a/pkg/driver/identity.go b/pkg/driver/identity.go
@@ -41,6 +41,13 @@ func (d *Driver) GetPluginCapabilities(ctx context.Context, req *csi.GetPluginCa
 					},
 				},
 			},
+			{
+				Type: &csi.PluginCapability_Service_{
+					Service: &csi.PluginCapability_Service{
+						Type: csi.PluginCapability_Service_ACCESSIBILITY_CONSTRAINTS,
+					},
+				},
+			},
 		},
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     					},
     				},
     			},
+    			{
+    				Type: &csi.PluginCapability_Service_{
+    					Service: &csi.PluginCapability_Service{
+    						Type: csi.PluginCapability_Service_ACCESSIBILITY_CONSTRAINTS,
+    					},
+    				},
+    			},
     		},
     	}
@@ Expand Down @@