opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 04:46:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16067 from tyler92/fix-directory-or-create

Browse Source 
Create a full path to a directory when DirectoryOrCreate is used
This commit is contained in:
OpenShift Merge Robot
2022-10-06 19:43:47 +02:00
committed by GitHub
parent eb85012064 8b189c0a06
commit ab3d3f818d
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/specgen/generate/kube/volume.go
View File

@ -56,10 +56,8 @@ func VolumeFromHostPath(hostPath *v1.HostPathVolumeSource) (*KubeVolume, error)
if hostPath.Type != nil { if hostPath.Type != nil {
switch *hostPath.Type { switch *hostPath.Type {
case v1.HostPathDirectoryOrCreate: case v1.HostPathDirectoryOrCreate:
if _, err := os.Stat(hostPath.Path); os.IsNotExist(err) { if err := os.MkdirAll(hostPath.Path, kubeDirectoryPermission); err != nil {
if err := os.Mkdir(hostPath.Path, kubeDirectoryPermission); err != nil { return nil, err
return nil, err
}
} }
// Label a newly created volume // Label a newly created volume
if err := libpod.LabelVolumePath(hostPath.Path); err != nil { if err := libpod.LabelVolumePath(hostPath.Path); err != nil {

30
test/e2e/play_kube_test.go
View File

@ -2604,6 +2604,36 @@ spec:
Expect(st.Mode().IsDir()).To(Equal(true)) Expect(st.Mode().IsDir()).To(Equal(true))
}) })
It("podman play kube test with DirectoryOrCreate HostPath type volume and non-existent directory path", func() {
hostPathLocation := filepath.Join(filepath.Join(tempdir, "dir1"), "dir2")
pod := getPod(withVolume(getHostPathVolume("DirectoryOrCreate", hostPathLocation)))
err := generateKubeYaml("pod", pod, kubeYaml)
Expect(err).To(BeNil())
kube := podmanTest.Podman([]string{"play", "kube", kubeYaml})
kube.WaitWithDefaultTimeout()
Expect(kube).Should(Exit(0))
// the full path should have been created
st, err := os.Stat(hostPathLocation)
Expect(err).To(BeNil())
Expect(st.Mode().IsDir()).To(Equal(true))
})
It("podman play kube test with DirectoryOrCreate HostPath type volume and existent directory path", func() {
hostPathLocation := filepath.Join(filepath.Join(tempdir, "dir1"), "dir2")
Expect(os.MkdirAll(hostPathLocation, os.ModePerm)).To(BeNil())
pod := getPod(withVolume(getHostPathVolume("DirectoryOrCreate", hostPathLocation)))
err := generateKubeYaml("pod", pod, kubeYaml)
Expect(err).To(BeNil())
kube := podmanTest.Podman([]string{"play", "kube", kubeYaml})
kube.WaitWithDefaultTimeout()
Expect(kube).Should(Exit(0))
})
It("podman play kube test with Socket HostPath type volume should fail if not socket", func() { It("podman play kube test with Socket HostPath type volume should fail if not socket", func() {
hostPathLocation := filepath.Join(tempdir, "file") hostPathLocation := filepath.Join(tempdir, "file")
f, err := os.Create(hostPathLocation) f, err := os.Create(hostPathLocation)