Merge pull request #6156 from nanikjava/f-fix-5144

Customizing host path for dynamically provisioned PersistentVolumes
kubernetes · Feb 5, 2020 · 88693f2 · 88693f2
2 parents 6d4ee3a + 0d29a2a
commit 88693f2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -91,7 +91,7 @@ endif
 
 # Set the version information for the Kubernetes servers
 MINIKUBE_LDFLAGS := -X k8s.io/minikube/pkg/version.version=$(VERSION) -X k8s.io/minikube/pkg/version.isoVersion=$(ISO_VERSION) -X k8s.io/minikube/pkg/version.isoPath=$(ISO_BUCKET) -X k8s.io/minikube/pkg/version.gitCommitID=$(COMMIT)
-PROVISIONER_LDFLAGS := "-X k8s.io/minikube/pkg/storage.version=$(STORAGE_PROVISIONER_TAG) -s -w"
+PROVISIONER_LDFLAGS := "-X k8s.io/minikube/pkg/storage.version=$(STORAGE_PROVISIONER_TAG) -s -w -extldflags '-static'"
 
 MINIKUBEFILES := ./cmd/minikube/
 HYPERKIT_FILES := ./cmd/drivers/hyperkit

diff --git a/cmd/storage-provisioner/main.go b/cmd/storage-provisioner/main.go
@@ -25,6 +25,8 @@ import (
 	"k8s.io/minikube/pkg/storage"
 )
 
+var pvDir = "/tmp/hostpath-provisioner"
+
 func main() {
 	// Glog requires that /tmp exists.
 	if err := os.MkdirAll("/tmp", 0755); err != nil {
@@ -33,7 +35,7 @@ func main() {
 	}
 	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
@@ -31,7 +31,7 @@ metadata:
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: system:persistent-volume-provisioner
+  name: cluster-admin
 subjects:
   - kind: ServiceAccount
     name: storage-provisioner

diff --git a/deploy/storage-provisioner/Dockerfile b/deploy/storage-provisioner/Dockerfile
@@ -14,5 +14,5 @@
 
 FROM scratch
 ARG arch
-COPY out/storage-provisioner-${arch} storage-provisioner
+COPY out/storage-provisioner-${arch} /storage-provisioner
 CMD ["/storage-provisioner"]
diff --git a/pkg/storage/storage_provisioner.go b/pkg/storage/storage_provisioner.go
@@ -45,9 +45,9 @@ type hostPathProvisioner struct {
 }
 
 // NewHostPathProvisioner creates a new Provisioner using host paths
-func NewHostPathProvisioner() controller.Provisioner {
+func NewHostPathProvisioner(pvDir string) controller.Provisioner {
 	return &hostPathProvisioner{
-		pvDir:    "/tmp/hostpath-provisioner",
+		pvDir:    pvDir,
 		identity: uuid.NewUUID(),
 	}
 }
@@ -57,7 +57,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
 	}
@@ -103,16 +103,15 @@ func (p *hostPathProvisioner) Delete(volume *core.PersistentVolume) error {
 		return &controller.IgnoredError{Reason: "identity annotation on PV does not match ours"}
 	}
 
-	path := path.Join(p.pvDir, volume.Name)
-	if err := os.RemoveAll(path); err != nil {
+	if err := os.RemoveAll(volume.Spec.PersistentVolumeSource.HostPath.Path); err != nil {
 		return errors.Wrap(err, "removing hostpath PV")
 	}
 
 	return nil
 }
 
 // StartStorageProvisioner will start storage provisioner server
-func StartStorageProvisioner() error {
+func StartStorageProvisioner(pvDir string) error {
 	glog.Infof("Initializing the Minikube storage provisioner...")
 	config, err := rest.InClusterConfig()
 	if err != nil {
@@ -132,7 +131,7 @@ func StartStorageProvisioner() error {
 
 	// Create the provisioner: it implements the Provisioner interface expected by
 	// the controller
-	hostPathProvisioner := NewHostPathProvisioner()
+	hostPathProvisioner := NewHostPathProvisioner(pvDir)
 
 	// Start the provision controller which will dynamically provision hostPath
 	// PVs