From e8289ceb9da6aec391438a31d9ace0285f755f0a Mon Sep 17 00:00:00 2001 From: markturansky Date: Wed, 29 Jul 2015 14:48:06 -0400 Subject: [PATCH] rebased and updated --- pkg/volume/git_repo/git_repo.go | 2 +- pkg/volume/host_path/host_path.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/volume/git_repo/git_repo.go b/pkg/volume/git_repo/git_repo.go index 135110b8aa8..de431a5ce92 100644 --- a/pkg/volume/git_repo/git_repo.go +++ b/pkg/volume/git_repo/git_repo.go @@ -118,7 +118,7 @@ func (b *gitRepoVolumeBuilder) SetUp() error { return b.SetUpAt(b.GetPath()) } -func (gr *gitRepo) IsReadOnly() bool { +func (b *gitRepoVolumeBuilder) IsReadOnly() bool { return false } diff --git a/pkg/volume/host_path/host_path.go b/pkg/volume/host_path/host_path.go index 2afd40325d8..7e5118f1d4b 100644 --- a/pkg/volume/host_path/host_path.go +++ b/pkg/volume/host_path/host_path.go @@ -72,12 +72,12 @@ func (plugin *hostPathPlugin) GetAccessModes() []api.PersistentVolumeAccessMode func (plugin *hostPathPlugin) NewBuilder(spec *volume.Spec, pod *api.Pod, _ volume.VolumeOptions, _ mount.Interface) (volume.Builder, error) { if spec.VolumeSource.HostPath != nil { return &hostPathBuilder{ - hostPath: spec.VolumeSource.HostPath, + hostPath: &hostPath{path: spec.VolumeSource.HostPath.Path}, readOnly: false, }, nil } else { return &hostPathBuilder{ - hostPath: spec.PersistentVolumeSource.HostPath, + hostPath: &hostPath{path: spec.PersistentVolumeSource.HostPath.Path}, readOnly: spec.ReadOnly, }, nil } @@ -102,7 +102,7 @@ func newRecycler(spec *volume.Spec, host volume.VolumeHost) (volume.Recycler, er // HostPath volumes represent a bare host file or directory mount. // The direct at the specified path will be directly exposed to the container. type hostPath struct { - path string + path string } func (hp *hostPath) GetPath() string {