UPSTREAM: 29006: Dynamic provisioning v2beta

- it is not merged upstream yet
- some changes outside of `vedor/` were needed to compile it and run it
  (especially pv-binder-controller got privileges to list+watch
  extensions/StorageClass instances)

pkg/cmd/server/bootstrappolicy/infra_sa_policy.go

@@ -506,6 +506,12 @@ func init() {
  Verbs: sets.NewString("create", "update", "patch"),
  Resources: sets.NewString("events"),
  },
+ // PersistentVolumeController.syncClaim() -> provisionClaim()
+ {
+ APIGroups: []string{extensions.GroupName},
+ Verbs: sets.NewString("list", "watch"),
+ Resources: sets.NewString("storageclasses"),
+ },
  },
  },
  )

pkg/cmd/server/kubernetes/master.go

@@ -154,20 +154,15 @@ func (c *MasterConfig) RunNamespaceController(kubeClient internalclientset.Inter
 
 func (c *MasterConfig) RunPersistentVolumeController(client *client.Client, namespace, recyclerImageName, recyclerServiceAccountName string) {
  s := c.ControllerManager
- provisioner, err := kctrlmgr.NewVolumeProvisioner(c.CloudProvider, s.VolumeConfiguration)
- if err != nil {
- glog.Fatal("A Provisioner could not be created, but one was expected. Provisioning will not work. This functionality is considered an early Alpha version.")
- }
-
  volumeController := persistentvolumecontroller.NewPersistentVolumeController(
  clientadapter.FromUnversionedClient(client),
  s.PVClaimBinderSyncPeriod.Duration,
- provisioner,
- probeRecyclableVolumePlugins(s.VolumeConfiguration, namespace, recyclerImageName, recyclerServiceAccountName),
+ probeControllerVolumePlugins(s.VolumeConfiguration, namespace, recyclerImageName, recyclerServiceAccountName),
  c.CloudProvider,
  s.ClusterName,
- nil, nil, nil,
+ nil, nil, nil, nil,
  s.VolumeConfiguration.EnableDynamicProvisioning,
+ "",
  )
  volumeController.Run()
 
@@ -187,8 +182,8 @@ func (c *MasterConfig) RunPersistentVolumeController(client *client.Client, name
  }
 }
 
-// probeRecyclableVolumePlugins collects all persistent volume plugins into an easy to use list.
-func probeRecyclableVolumePlugins(config componentconfig.VolumeConfiguration, namespace, recyclerImageName, recyclerServiceAccountName string) []volume.VolumePlugin {
+// probeControllerVolumePlugins collects all persistent volume plugins into an easy to use list.
+func probeControllerVolumePlugins(config componentconfig.VolumeConfiguration, namespace, recyclerImageName, recyclerServiceAccountName string) []volume.VolumePlugin {
  uid := int64(0)
  defaultScrubPod := volume.NewPersistentVolumeRecyclerPodTemplate()
  defaultScrubPod.Namespace = namespace
@@ -214,6 +209,7 @@ func probeRecyclableVolumePlugins(config componentconfig.VolumeConfiguration, na
  RecyclerMinimumTimeout: int(config.PersistentVolumeRecyclerConfiguration.MinimumTimeoutHostPath),
  RecyclerTimeoutIncrement: int(config.PersistentVolumeRecyclerConfiguration.IncrementTimeoutHostPath),
  RecyclerPodTemplate: defaultScrubPod,
+ ProvisioningEnabled: config.EnableHostPathProvisioning,
  }
  if err := kctrlmgr.AttemptToLoadRecycler(config.PersistentVolumeRecyclerConfiguration.PodTemplateFilePathHostPath, &hostPathConfig); err != nil {
  glog.Fatalf("Could not create hostpath recycler pod from file %s: %+v", config.PersistentVolumeRecyclerConfiguration.PodTemplateFilePathHostPath, err)

test/testdata/bootstrappolicy/bootstrap_cluster_roles.yaml

@@ -2660,6 +2660,14 @@ items:
  - create
  - patch
  - update
+ - apiGroups:
+ - extensions
+ attributeRestrictions: null
+ resources:
+ - storageclasses
+ verbs:
+ - list
+ - watch
 - apiVersion: v1
  kind: ClusterRole
  metadata: