From 23722fbdfa910ab664d5750b0a534592f95c5dbf Mon Sep 17 00:00:00 2001 From: wenlxie Date: Thu, 21 Jun 2018 20:01:58 +0800 Subject: [PATCH] fix localvolume volume mode not found issue --- pkg/volume/local/local.go | 2 ++ pkg/volume/local/local_test.go | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/pkg/volume/local/local.go b/pkg/volume/local/local.go index 854c6d9682..5a3e2ea64c 100644 --- a/pkg/volume/local/local.go +++ b/pkg/volume/local/local.go @@ -169,6 +169,7 @@ func (plugin *localVolumePlugin) NewBlockVolumeUnmapper(volName string, // TODO: check if no path and no topology constraints are ok func (plugin *localVolumePlugin) ConstructVolumeSpec(volumeName, mountPath string) (*volume.Spec, error) { + fs := v1.PersistentVolumeFilesystem localVolume := &v1.PersistentVolume{ ObjectMeta: metav1.ObjectMeta{ Name: volumeName, @@ -179,6 +180,7 @@ func (plugin *localVolumePlugin) ConstructVolumeSpec(volumeName, mountPath strin Path: "", }, }, + VolumeMode: &fs, }, } return volume.NewSpecFromPersistentVolume(localVolume, false), nil diff --git a/pkg/volume/local/local_test.go b/pkg/volume/local/local_test.go index 2c1763fb58..0d9cdd6007 100644 --- a/pkg/volume/local/local_test.go +++ b/pkg/volume/local/local_test.go @@ -336,6 +336,14 @@ func TestConstructVolumeSpec(t *testing.T) { t.Fatalf("PersistentVolume object nil") } + if spec.PersistentVolume.Spec.VolumeMode == nil { + t.Fatalf("Volume mode has not been set.") + } + + if *spec.PersistentVolume.Spec.VolumeMode != v1.PersistentVolumeFilesystem { + t.Errorf("Unexpected volume mode %q", *spec.PersistentVolume.Spec.VolumeMode) + } + ls := pv.Spec.PersistentVolumeSource.Local if ls == nil { t.Fatalf("LocalVolumeSource object nil")