Skip to content
Snippets Groups Projects
Commit a20bd9c9 authored by Jeremy Scott's avatar Jeremy Scott Committed by Derek Su
Browse files

Return error if unknown volume type given

parent 6c5a419e
No related branches found
No related tags found
No related merge requests found
...@@ -292,7 +292,10 @@ func (p *LocalPathProvisioner) Provision(ctx context.Context, opts pvController. ...@@ -292,7 +292,10 @@ func (p *LocalPathProvisioner) Provision(ctx context.Context, opts pvController.
} else { } else {
volumeType = defaultVolumeType volumeType = defaultVolumeType
} }
pvs = createPersistentVolumeSource(volumeType, path) pvs, err = createPersistentVolumeSource(volumeType, path)
if err != nil {
return nil, pvController.ProvisioningFinished, err
}
var nodeAffinity *v1.VolumeNodeAffinity var nodeAffinity *v1.VolumeNodeAffinity
if sharedFS { if sharedFS {
...@@ -652,8 +655,11 @@ func canonicalizeConfig(data *ConfigData) (cfg *Config, err error) { ...@@ -652,8 +655,11 @@ func canonicalizeConfig(data *ConfigData) (cfg *Config, err error) {
return cfg, nil return cfg, nil
} }
func createPersistentVolumeSource(volumeType string, path string) v1.PersistentVolumeSource { func createPersistentVolumeSource(volumeType string, path string) (pvs v1.PersistentVolumeSource, err error) {
var pvs v1.PersistentVolumeSource defer func() {
err = errors.Wrapf(err, "failed to create persistent volume source")
}()
switch strings.ToLower(volumeType) { switch strings.ToLower(volumeType) {
case "local": case "local":
pvs = v1.PersistentVolumeSource{ pvs = v1.PersistentVolumeSource{
...@@ -670,13 +676,8 @@ func createPersistentVolumeSource(volumeType string, path string) v1.PersistentV ...@@ -670,13 +676,8 @@ func createPersistentVolumeSource(volumeType string, path string) v1.PersistentV
}, },
} }
default: default:
hostPathType := v1.HostPathDirectoryOrCreate return pvs, fmt.Errorf("\"%s\" is not a recognised volume type", volumeType)
pvs = v1.PersistentVolumeSource{
HostPath: &v1.HostPathVolumeSource{
Path: path,
Type: &hostPathType,
},
}
} }
return pvs
return pvs, nil
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment