make dynamic persistent volumes path readable and configurable

kubernetes · Sep 19, 2019 · 347d4f9 · 347d4f9
1 parent ddcc09f
commit 347d4f9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/cmd/minikube/cmd/config/config.go b/cmd/minikube/cmd/config/config.go
@@ -201,12 +201,6 @@ var settings = []Setting{
 		validations: []setFn{IsValidAddon},
 		callbacks:   []setFn{EnableOrDisableAddon},
 	},
-	{
-		name:        "default-storageclass",
-		set:         SetBool,
-		validations: []setFn{IsValidAddon},
-		callbacks:   []setFn{EnableOrDisableStorageClasses},
-	},
 	{
 		name:        "storage-provisioner",
 		set:         SetBool,

diff --git a/cmd/storage-provisioner/main.go b/cmd/storage-provisioner/main.go
@@ -25,15 +25,21 @@ import (
 	"k8s.io/minikube/pkg/storage"
 )
 
+const defaultPvDir = "/pvc"
+const pvDirParam = "pv-dir"
+
 func main() {
 	// Glog requires that /tmp exists.
 	if err := os.MkdirAll("/tmp", 0755); err != nil {
 		fmt.Fprintf(os.Stderr, "Error creating tmpdir: %v\n", err)
 		os.Exit(1)
 	}
+
+	var pvDir = flag.String(pvDirParam, defaultPvDir, "Directory for dynamically provisioned persistent volumes")
+
 	flag.Parse()
 
-	if err := storage.StartStorageProvisioner(); err != nil {
+	if err := storage.StartStorageProvisioner(*pvDir); err != nil {
 		glog.Exit(err)
 	}
 

diff --git a/deploy/addons/storage-provisioner/storage-provisioner.yaml.tmpl b/deploy/addons/storage-provisioner/storage-provisioner.yaml.tmpl
@@ -53,6 +53,7 @@ spec:
   - name: storage-provisioner
     image: {{default "gcr.io/k8s-minikube" .ImageRepository}}/storage-provisioner{{.ExoticArch}}:v1.8.1
     command: ["/storage-provisioner"]
+    args: ["pv-dir", "/prv/test"]
     imagePullPolicy: IfNotPresent
     volumeMounts:
     - mountPath: /tmp

diff --git a/deploy/iso/minikube-iso/package/automount/minikube-automount b/deploy/iso/minikube-iso/package/automount/minikube-automount
@@ -125,9 +125,9 @@ if [ -n "$BOOT2DOCKER_DATA" ]; then
     mkdir /tmp/hostpath_pv
     mount --bind /mnt/$PARTNAME/hostpath_pv /tmp/hostpath_pv
 
-    mkdir -p /mnt/$PARTNAME/hostpath-provisioner
-    mkdir /tmp/hostpath-provisioner
-    mount --bind /mnt/$PARTNAME/hostpath-provisioner /tmp/hostpath-provisioner
+    mkdir -p /mnt/$PARTNAME/pvc
+    mkdir /pvc
+    mount --bind /mnt/$PARTNAME/pvc /pvc
 
     if [ -e "/userdata.tar" ]; then
         mv /userdata.tar /var/lib/boot2docker/

diff --git a/pkg/storage/storage_provisioner.go b/pkg/storage/storage_provisioner.go
@@ -35,6 +35,8 @@ import (
 
 const provisionerName = "k8s.io/minikube-hostpath"
 
+var pvDir string
+
 type hostPathProvisioner struct {
 	// The directory to create PV-backing directories in
 	pvDir string
@@ -47,7 +49,7 @@ type hostPathProvisioner struct {
 // NewHostPathProvisioner creates a new Provisioner using host paths
 func NewHostPathProvisioner() controller.Provisioner {
 	return &hostPathProvisioner{
-		pvDir:    "/tmp/hostpath-provisioner",
+		pvDir:    pvDir,
 		identity: uuid.NewUUID(),
 	}
 }
@@ -57,7 +59,7 @@ var _ controller.Provisioner = &hostPathProvisioner{}
 // Provision creates a storage asset and returns a PV object representing it.
 func (p *hostPathProvisioner) Provision(options controller.ProvisionOptions) (*core.PersistentVolume, error) {
 	glog.Infof("Provisioning volume %v", options)
-	path := path.Join(p.pvDir, options.PVName)
+	path := path.Join(p.pvDir, options.PVC.Name)
 	if err := os.MkdirAll(path, 0777); err != nil {
 		return nil, err
 	}
@@ -112,8 +114,11 @@ func (p *hostPathProvisioner) Delete(volume *core.PersistentVolume) error {
 }
 
 // StartStorageProvisioner will start storage provisioner server
-func StartStorageProvisioner() error {
+func StartStorageProvisioner(pvDirParam string) error {
 	glog.Infof("Initializing the Minikube storage provisioner...")
+
+	pvDir = pvDirParam
+
 	config, err := rest.InClusterConfig()
 	if err != nil {
 		return err