resources: Add code to use Spec.Storage.PVC.path

We use this to mount the path within a pvc.

Signed-off-by: Sachin Prabhu <[email protected]>

Author: spuiuk

internal/planner/configuration.go

@@ -101,6 +101,9 @@ func (pl *Planner) Update() (changed bool, err error) {
 		}
 		pl.ConfigState.Shares[shareKey] = share
 		changed = true
+	} else if share.Options["path"] != pl.Paths().Share() {
+		// Update path if changed
+		share.Options["path"] = pl.Paths().Share()
 	}
 	cfgKey := pl.instanceID()
 	cfg, found := pl.ConfigState.Configs[cfgKey]

internal/planner/paths.go

@@ -30,9 +30,18 @@ func (planner *Planner) Paths() *Paths {
 	return &Paths{planner}
 }
 
+// ShareMountPath returns the mount path.
+func (p *Paths) ShareMountPath() string {
+	return path.Join("/mnt", string(p.planner.SmbShare.UID))
+}
+
 // Share path.
 func (p *Paths) Share() string {
-	return path.Join("/mnt", string(p.planner.SmbShare.UID))
+	sharepath := p.planner.SmbShare.Spec.Storage.Pvc.Path
+	if sharepath != "" {
+		return path.Join(p.ShareMountPath(), "/", sharepath)
+	}
+	return p.ShareMountPath()
 }
 
 // ContainerConfigs returns a slice containing all configuration

internal/resources/volumes.go

@@ -66,7 +66,7 @@ func shareVolumeAndMount(planner *pln.Planner, pvcName string) volMount {
 	}
 	// mount
 	vmnt.mount = corev1.VolumeMount{
-		MountPath: planner.Paths().Share(),
+		MountPath: planner.Paths().ShareMountPath(),
 		Name:      pvcVolName,
 	}
 	return vmnt