diff --git a/cmd/nfs-subdir-external-provisioner/provisioner.go b/cmd/nfs-subdir-external-provisioner/provisioner.go index f4b1a2d0..88be3c85 100644 --- a/cmd/nfs-subdir-external-provisioner/provisioner.go +++ b/cmd/nfs-subdir-external-provisioner/provisioner.go @@ -25,16 +25,15 @@ import ( "regexp" "strings" - "k8s.io/kubernetes/pkg/apis/core/v1/helper" - "github.com/golang/glog" - "github.com/kubernetes-sigs/sig-storage-lib-external-provisioner/controller" v1 "k8s.io/api/core/v1" storage "k8s.io/api/storage/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" + "k8s.io/kubernetes/pkg/apis/core/v1/helper" + "sigs.k8s.io/sig-storage-lib-external-provisioner/controller" ) const ( @@ -76,7 +75,7 @@ const ( var _ controller.Provisioner = &nfsProvisioner{} -func (p *nfsProvisioner) Provision(options controller.VolumeOptions) (*v1.PersistentVolume, error) { +func (p *nfsProvisioner) Provision(options controller.ProvisionOptions) (*v1.PersistentVolume, error) { if options.PVC.Spec.Selector != nil { return nil, fmt.Errorf("claim Selector is not supported") } @@ -99,7 +98,7 @@ func (p *nfsProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis fullPath := filepath.Join(mountPath, pvName) path := filepath.Join(p.path, pvName) - pathPattern, exists := options.Parameters["pathPattern"] + pathPattern, exists := options.StorageClass.Parameters["pathPattern"] if exists { customPath := metadata.stringParser(pathPattern) path = filepath.Join(p.path, customPath) @@ -117,9 +116,9 @@ func (p *nfsProvisioner) Provision(options controller.VolumeOptions) (*v1.Persis Name: options.PVName, }, Spec: v1.PersistentVolumeSpec{ - PersistentVolumeReclaimPolicy: options.PersistentVolumeReclaimPolicy, + PersistentVolumeReclaimPolicy: *options.StorageClass.ReclaimPolicy, AccessModes: options.PVC.Spec.AccessModes, - MountOptions: options.MountOptions, + // MountOptions: options.MountOptions, Capacity: v1.ResourceList{ v1.ResourceName(v1.ResourceStorage): options.PVC.Spec.Resources.Requests[v1.ResourceName(v1.ResourceStorage)], },