public_git
/
kubernetes-sigs_nfs-subdir-external-provisioner
mirror of https://github.com/kubernetes-sigs/nfs-subdir-external-provisioner.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unnecessary conversion of resource storage 

This commit also does more corrections like error handling,
formatting, typos..etc

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal 2022-02-10 12:27:04 +05:30
parent e53fbc3d59
commit 7c23a7dd7a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/nfs-subdir-external-provisioner/provisioner.go
View File

@ -112,10 +112,10 @@ func (p *nfsProvisioner) Provision(ctx context.Context, options controller.Provi
} }
glog.V(4).Infof("creating path %s", fullPath) glog.V(4).Infof("creating path %s", fullPath)
if err := os.MkdirAll(fullPath, 0777); err != nil { if err := os.MkdirAll(fullPath, 0o777); err != nil {
return nil, controller.ProvisioningFinished, errors.New("unable to create directory to provision new pv: " + err.Error()) return nil, controller.ProvisioningFinished, errors.New("unable to create directory to provision new pv: " + err.Error())
} }
err := os.Chmod(fullPath, 0777) err := os.Chmod(fullPath, 0o777)
if err != nil { if err != nil {
return nil, "", err return nil, "", err
} }
@ -159,14 +159,12 @@ func (p *nfsProvisioner) Delete(ctx context.Context, volume *v1.PersistentVolume
} }
// Determine if the "onDelete" parameter exists. // Determine if the "onDelete" parameter exists.
// If it exists and has a delete value, delete the directory. // If it exists and has a `delete` value, delete the directory.
// If it exists and has a retain value, safe the directory. // If it exists and has a `retain` value, safe the directory.
onDelete := storageClass.Parameters["onDelete"] onDelete := storageClass.Parameters["onDelete"]
switch onDelete { switch onDelete {
case "delete": case "delete":
return os.RemoveAll(oldPath) return os.RemoveAll(oldPath)
case "retain": case "retain":
return nil return nil
} }
@ -190,7 +188,7 @@ func (p *nfsProvisioner) Delete(ctx context.Context, volume *v1.PersistentVolume
return os.Rename(oldPath, archivePath) return os.Rename(oldPath, archivePath)
} }
// getClassForVolume returns StorageClass // getClassForVolume returns StorageClass.
func (p *nfsProvisioner) getClassForVolume(ctx context.Context, pv *v1.PersistentVolume) (*storage.StorageClass, error) { func (p *nfsProvisioner) getClassForVolume(ctx context.Context, pv *v1.PersistentVolume) (*storage.StorageClass, error) {
if p.client == nil { if p.client == nil {
return nil, fmt.Errorf("cannot get kube client") return nil, fmt.Errorf("cannot get kube client")
@ -203,6 +201,7 @@ func (p *nfsProvisioner) getClassForVolume(ctx context.Context, pv *v1.Persisten
if err != nil { if err != nil {
return nil, err return nil, err
} }
return class, nil return class, nil
} }