Skip to content

Commit

Permalink
nfs: fix error handling
Browse files Browse the repository at this point in the history
  • Loading branch information
Mate Ory authored and baluchicken committed Oct 19, 2018
1 parent 2b1545a commit 52541d2
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions pkg/stub/providers/nfs.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,14 @@ const (

// SetUpNfsProvisioner sets up a deployment a pvc and a service to handle nfs workload
func SetUpNfsProvisioner(pv *v1.PersistentVolumeClaim) error {
logrus.Info("Creating new PersistentVolumeClaim for Nfs provisioner..")
logrus.Info("Creating new PersistentVolumeClaim for Nfs provisioner...")

const volumeName = "nfs-prov-volume"

nfsNamespace := os.Getenv(namespaceForNFS)
if nfsNamespace == "" {
nfsNamespace = "default"
}

nfsProvisionerCPURequest := resource.MustParse("250m")
if value := os.Getenv(cpuRequestForNFS); value != "" {
Expand All @@ -41,7 +44,7 @@ func SetUpNfsProvisioner(pv *v1.PersistentVolumeClaim) error {
}
}

plusStorage, _ := resource.ParseQuantity("2Gi")
plusStorage := resource.MustParse("2Gi")
parsedStorageSize := pv.Spec.Resources.Requests["storage"]
parsedStorageSize.Add(plusStorage)
isLocalVolume := false
Expand Down Expand Up @@ -244,11 +247,11 @@ func SetUpNfsProvisioner(pv *v1.PersistentVolumeClaim) error {
// CheckNfsServerExistence checks if the NFS deployment and all companion service exists
func CheckNfsServerExistence(name, namespace string) bool {
if !CheckPersistentVolumeClaimExistence(fmt.Sprintf("%s-data", name), namespace) {
logrus.Info("PersistentVolume claim for Nfs does not exists!")
logrus.Info("PersistentVolume claim for Nfs does not exist!")
return false
}
if !checkNfsProviderDeployment() {
logrus.Info("Nfs provider deployment does not exists!")
logrus.Info("Nfs provider deployment does not exist!")
return false
}
if !CheckStorageClassExistence(name) {
Expand Down Expand Up @@ -299,11 +302,11 @@ func checkNfsProviderDeployment() bool {
},
}
if err := sdk.Get(deployment); err != nil {
logrus.Infof("Nfs provider deployment does not exists %s", err.Error())
logrus.Infof("Nfs provider deployment does not exist: %v", err)
return false
}
if err := sdk.Get(service); err != nil {
logrus.Infof("Nfs provider service does not exists %s", err.Error())
logrus.Infof("Nfs provider service does not exist: %v", err)
return false
}
logrus.Info("Nfs provider exists!")
Expand Down

0 comments on commit 52541d2

Please sign in to comment.