Skip to content
Snippets Groups Projects
Commit df53c25a authored by Sheng Yang's avatar Sheng Yang Committed by Sheng Yang
Browse files

Revert "Create local volumes instead of hostPath"

This reverts commit fb27d148.

Local volumes breaks provisioner on RKE.

Revert: https://github.com/rancher/local-path-provisioner/pull/91
parent 737d3e33
Branches
Tags
No related merge requests found
...@@ -198,6 +198,7 @@ func (p *LocalPathProvisioner) Provision(opts pvController.ProvisionOptions) (*v ...@@ -198,6 +198,7 @@ func (p *LocalPathProvisioner) Provision(opts pvController.ProvisionOptions) (*v
} }
fs := v1.PersistentVolumeFilesystem fs := v1.PersistentVolumeFilesystem
hostPathType := v1.HostPathDirectoryOrCreate
return &v1.PersistentVolume{ return &v1.PersistentVolume{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: name, Name: name,
...@@ -210,8 +211,9 @@ func (p *LocalPathProvisioner) Provision(opts pvController.ProvisionOptions) (*v ...@@ -210,8 +211,9 @@ func (p *LocalPathProvisioner) Provision(opts pvController.ProvisionOptions) (*v
v1.ResourceName(v1.ResourceStorage): pvc.Spec.Resources.Requests[v1.ResourceName(v1.ResourceStorage)], v1.ResourceName(v1.ResourceStorage): pvc.Spec.Resources.Requests[v1.ResourceName(v1.ResourceStorage)],
}, },
PersistentVolumeSource: v1.PersistentVolumeSource{ PersistentVolumeSource: v1.PersistentVolumeSource{
Local: &v1.LocalVolumeSource{ HostPath: &v1.HostPathVolumeSource{
Path: path, Path: path,
Type: &hostPathType,
}, },
}, },
NodeAffinity: &v1.VolumeNodeAffinity{ NodeAffinity: &v1.VolumeNodeAffinity{
...@@ -261,11 +263,11 @@ func (p *LocalPathProvisioner) getPathAndNodeForPV(pv *v1.PersistentVolume) (pat ...@@ -261,11 +263,11 @@ func (p *LocalPathProvisioner) getPathAndNodeForPV(pv *v1.PersistentVolume) (pat
err = errors.Wrapf(err, "failed to delete volume %v", pv.Name) err = errors.Wrapf(err, "failed to delete volume %v", pv.Name)
}() }()
local := pv.Spec.PersistentVolumeSource.Local hostPath := pv.Spec.PersistentVolumeSource.HostPath
if local == nil { if hostPath == nil {
return "", "", fmt.Errorf("no Local set") return "", "", fmt.Errorf("no HostPath set")
} }
path = local.Path path = hostPath.Path
nodeAffinity := pv.Spec.NodeAffinity nodeAffinity := pv.Spec.NodeAffinity
if nodeAffinity == nil { if nodeAffinity == nil {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment