Skip to content
This repository was archived by the owner on Oct 21, 2020. It is now read-only.

Commit 06f19d7

Browse files
authored
Merge pull request #655 from humblec/file-refactor-1
Change provisioner variable name.
2 parents 97b9779 + 57413d9 commit 06f19d7

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

gluster/file/cmd/glusterfile-provisioner/glusterfile-provisioner.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ func (p *glusterfileProvisioner) ExpandVolumeDevice(spec *volume.Spec, newSize r
284284
expansionSizeGiB := int(util.RoundUpToGiB(expansionSize))
285285

286286
// Find out requested Size
287-
//requestGiB := util.RoundUpToGiB(newSize)
288287
requestGiB := int(util.RoundUpToGiB(newSize.Value()))
289288

290289
//Check the existing volume size
@@ -509,6 +508,7 @@ func (p *glusterfileProvisioner) Delete(volume *v1.PersistentVolume) error {
509508
return nil
510509

511510
}
511+
512512
func (p *glusterfileProvisioner) deleteEndpointService(namespace string, epServiceName string) (err error) {
513513
kubeClient := p.client
514514
if kubeClient == nil {
@@ -730,16 +730,16 @@ func main() {
730730
glog.Fatalf("Failed to create config: %v", err)
731731
}
732732

733-
prName := provisionerName
734-
provName := os.Getenv(provisionerNameKey)
733+
provName := provisionerName
734+
provEnvName := os.Getenv(provisionerNameKey)
735735

736736
// Precedence is given for ProvisionerNameKey
737-
if provName != "" && *id != "" {
738-
prName = provName
737+
if provEnvName != "" && *id != "" {
738+
provName = provEnvName
739739
}
740740

741-
if provName == "" && *id != "" {
742-
prName = *id
741+
if provEnvName == "" && *id != "" {
742+
provName = *id
743743
}
744744

745745
clientset, err := kubernetes.NewForConfig(config)
@@ -756,14 +756,14 @@ func main() {
756756

757757
// Create the provisioner: it implements the Provisioner interface expected by
758758
// the controller
759-
glusterfileProvisioner := NewglusterfileProvisioner(clientset, prName)
759+
glusterfileProvisioner := NewglusterfileProvisioner(clientset, provName)
760760

761761
// Start the provision controller which will dynamically provision glusterfs
762762
// PVs
763763

764764
pc := controller.NewProvisionController(
765765
clientset,
766-
prName,
766+
provName,
767767
glusterfileProvisioner,
768768
serverVersion.GitVersion,
769769
)

0 commit comments

Comments
 (0)