Merge pull request #11460 from jsafrane/backport-gluster

Merged by openshift-bot

Author: OpenShift Bot

pkg/cmd/server/bootstrappolicy/infra_sa_policy.go

@@ -583,11 +583,17 @@ func init() {
 					Resources: sets.NewString("events"),
 				},
 				// PersistentVolumeBinder.findProvisionablePlugin()
+				// Glusterfs provisioner
 				{
 					APIGroups: []string{storage.GroupName},
-					Verbs:     sets.NewString("list", "watch"),
+					Verbs:     sets.NewString("list", "watch", "get"),
 					Resources: sets.NewString("storageclasses"),
 				},
+				// Gluster provisioner
+				{
+					Verbs:     sets.NewString("get", "create", "delete"),
+					Resources: sets.NewString("services", "endpoints"),
+				},
 			},
 		},
 	)

pkg/cmd/server/kubernetes/master.go

@@ -66,8 +66,10 @@ import (
 	"k8s.io/kubernetes/pkg/volume/cinder"
 	"k8s.io/kubernetes/pkg/volume/flexvolume"
 	"k8s.io/kubernetes/pkg/volume/gce_pd"
+	"k8s.io/kubernetes/pkg/volume/glusterfs"
 	"k8s.io/kubernetes/pkg/volume/host_path"
 	"k8s.io/kubernetes/pkg/volume/nfs"
+	"k8s.io/kubernetes/pkg/volume/rbd"
 	"k8s.io/kubernetes/pkg/volume/vsphere_volume"
 
 	"k8s.io/kubernetes/plugin/pkg/scheduler"
@@ -262,6 +264,8 @@ func probeRecyclableVolumePlugins(config componentconfig.VolumeConfiguration, na
 	allPlugins = append(allPlugins, cinder.ProbeVolumePlugins()...)
 	allPlugins = append(allPlugins, flexvolume.ProbeVolumePlugins(config.FlexVolumePluginDir)...)
 	allPlugins = append(allPlugins, vsphere_volume.ProbeVolumePlugins()...)
+	allPlugins = append(allPlugins, glusterfs.ProbeVolumePlugins()...)
+	allPlugins = append(allPlugins, rbd.ProbeVolumePlugins()...)
 
 	return allPlugins
 }

test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml

@@ -3038,8 +3038,19 @@ items:
     resources:
     - storageclasses
     verbs:
+    - get
     - list
     - watch
+  - apiGroups:
+    - ""
+    attributeRestrictions: null
+    resources:
+    - endpoints
+    - services
+    verbs:
+    - create
+    - delete
+    - get
 - apiVersion: v1
   kind: ClusterRole
   metadata: