github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11575 from jiangyaoguo/new-builder-cleaner-for-host-path

Browse Source 
Refactor host_path volume to seperate builder and cleaner
This commit is contained in:
Mike Danese 2015-07-29 11:24:09 -07:00
commit 33888ba804
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkg/volume/host_path/host_path.go
View File

@ -71,14 +71,14 @@ func (plugin *hostPathPlugin) GetAccessModes() []api.PersistentVolumeAccessMode
func (plugin *hostPathPlugin) NewBuilder(spec *volume.Spec, pod *api.Pod, _ volume.VolumeOptions, _ mount.Interface) (volume.Builder, error) { func (plugin *hostPathPlugin) NewBuilder(spec *volume.Spec, pod *api.Pod, _ volume.VolumeOptions, _ mount.Interface) (volume.Builder, error) {
if spec.VolumeSource.HostPath != nil { if spec.VolumeSource.HostPath != nil {
return &hostPath{spec.VolumeSource.HostPath.Path}, nil return &hostPathBuilder{&hostPath{spec.VolumeSource.HostPath.Path}}, nil
} else { } else {
return &hostPath{spec.PersistentVolumeSource.HostPath.Path}, nil return &hostPathBuilder{&hostPath{spec.PersistentVolumeSource.HostPath.Path}}, nil
} }
} }
func (plugin *hostPathPlugin) NewCleaner(volName string, podUID types.UID, _ mount.Interface) (volume.Cleaner, error) { func (plugin *hostPathPlugin) NewCleaner(volName string, podUID types.UID, _ mount.Interface) (volume.Cleaner, error) {
return &hostPath{""}, nil return &hostPathCleaner{&hostPath{""}}, nil
} }
func (plugin *hostPathPlugin) NewRecycler(spec *volume.Spec) (volume.Recycler, error) { func (plugin *hostPathPlugin) NewRecycler(spec *volume.Spec) (volume.Recycler, error) {
@ -99,27 +99,39 @@ type hostPath struct {
path string path string
} }
// SetUp does nothing.
func (hp *hostPath) SetUp() error {
return nil
}
// SetUpAt does not make sense for host paths - probably programmer error.
func (hp *hostPath) SetUpAt(dir string) error {
return fmt.Errorf("SetUpAt() does not make sense for host paths")
}
func (hp *hostPath) GetPath() string { func (hp *hostPath) GetPath() string {
return hp.path return hp.path
} }
type hostPathBuilder struct {
*hostPath
}
var _ volume.Builder = &hostPathBuilder{}
// SetUp does nothing.
func (b *hostPathBuilder) SetUp() error {
return nil
}
// SetUpAt does not make sense for host paths - probably programmer error.
func (b *hostPathBuilder) SetUpAt(dir string) error {
return fmt.Errorf("SetUpAt() does not make sense for host paths")
}
type hostPathCleaner struct {
*hostPath
}
var _ volume.Cleaner = &hostPathCleaner{}
// TearDown does nothing. // TearDown does nothing.
func (hp *hostPath) TearDown() error { func (c *hostPathCleaner) TearDown() error {
return nil return nil
} }
// TearDownAt does not make sense for host paths - probably programmer error. // TearDownAt does not make sense for host paths - probably programmer error.
func (hp *hostPath) TearDownAt(dir string) error { func (c *hostPathCleaner) TearDownAt(dir string) error {
return fmt.Errorf("TearDownAt() does not make sense for host paths") return fmt.Errorf("TearDownAt() does not make sense for host paths")
} }