Revert "Merge pull request #40088 from jsafrane/storage-ga-v1"

This reverts commit 5984607cb9, reversing
changes made to 067f92e789.
This commit is contained in:
Jordan Liggitt
2017-02-25 22:35:15 -05:00
parent ce79526e37
commit 41c88e0455
81 changed files with 56 additions and 6984 deletions

View File

@@ -493,7 +493,7 @@ func StartControllers(controllers map[string]InitFunc, s *options.CMServer, root
ClusterName: s.ClusterName,
VolumeInformer: newSharedInformers.Core().V1().PersistentVolumes(),
ClaimInformer: newSharedInformers.Core().V1().PersistentVolumeClaims(),
ClassInformer: newSharedInformers.Storage().V1().StorageClasses(),
ClassInformer: newSharedInformers.Storage().V1beta1().StorageClasses(),
EnableDynamicProvisioning: s.VolumeConfiguration.EnableDynamicProvisioning,
}
volumeController := persistentvolumecontroller.NewController(params)