@@ -284,7 +284,6 @@ func (p *glusterfileProvisioner) ExpandVolumeDevice(spec *volume.Spec, newSize r
284
284
expansionSizeGiB := int (util .RoundUpToGiB (expansionSize ))
285
285
286
286
// Find out requested Size
287
- //requestGiB := util.RoundUpToGiB(newSize)
288
287
requestGiB := int (util .RoundUpToGiB (newSize .Value ()))
289
288
290
289
//Check the existing volume size
@@ -509,6 +508,7 @@ func (p *glusterfileProvisioner) Delete(volume *v1.PersistentVolume) error {
509
508
return nil
510
509
511
510
}
511
+
512
512
func (p * glusterfileProvisioner ) deleteEndpointService (namespace string , epServiceName string ) (err error ) {
513
513
kubeClient := p .client
514
514
if kubeClient == nil {
@@ -730,16 +730,16 @@ func main() {
730
730
glog .Fatalf ("Failed to create config: %v" , err )
731
731
}
732
732
733
- prName := provisionerName
734
- provName := os .Getenv (provisionerNameKey )
733
+ provName := provisionerName
734
+ provEnvName := os .Getenv (provisionerNameKey )
735
735
736
736
// Precedence is given for ProvisionerNameKey
737
- if provName != "" && * id != "" {
738
- prName = provName
737
+ if provEnvName != "" && * id != "" {
738
+ provName = provEnvName
739
739
}
740
740
741
- if provName == "" && * id != "" {
742
- prName = * id
741
+ if provEnvName == "" && * id != "" {
742
+ provName = * id
743
743
}
744
744
745
745
clientset , err := kubernetes .NewForConfig (config )
@@ -756,14 +756,14 @@ func main() {
756
756
757
757
// Create the provisioner: it implements the Provisioner interface expected by
758
758
// the controller
759
- glusterfileProvisioner := NewglusterfileProvisioner (clientset , prName )
759
+ glusterfileProvisioner := NewglusterfileProvisioner (clientset , provName )
760
760
761
761
// Start the provision controller which will dynamically provision glusterfs
762
762
// PVs
763
763
764
764
pc := controller .NewProvisionController (
765
765
clientset ,
766
- prName ,
766
+ provName ,
767
767
glusterfileProvisioner ,
768
768
serverVersion .GitVersion ,
769
769
)
0 commit comments