Skip to content

K
k3s
Unverified Commit ceb6dea1 authored by Antonio Murdaca's avatar Antonio Murdaca
Browse files
Options

test: e2e: support NFS test on overlayfs

TL;DR; NFS is not supported over overlayfs. In CRI-O we default to overlayfs as the storage driver, therefore running the NFS test always fails to export the directory. This patch adds a volume mount from the host so /exports isn't on overlayfs anymore. Signed-off-by: 's avatarAntonio Murdaca <runcom@redhat.com>
parent f3024879
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
test/e2e/framework/volume_util.go
View file @ ceb6dea1
...@@ -83,6 +83,7 @@ type VolumeTestConfig struct { ...@@ -83,6 +83,7 @@ type VolumeTestConfig struct {
ServerArgs []string ServerArgs []string
// Volumes needed to be mounted to the server container from the host // Volumes needed to be mounted to the server container from the host
// map <host (source) path> -> <container (dst.) path> // map <host (source) path> -> <container (dst.) path>
// if <host (source) path> is empty, mount a tmpfs emptydir
ServerVolumes map[string]string ServerVolumes map[string]string
// Wait for the pod to terminate successfully // Wait for the pod to terminate successfully
// False indicates that the pod is long running // False indicates that the pod is long running
...@@ -110,6 +111,7 @@ func NewNFSServer(cs clientset.Interface, namespace string, args []string) (conf ...@@ -110,6 +111,7 @@ func NewNFSServer(cs clientset.Interface, namespace string, args []string) (conf
Prefix: "nfs", Prefix: "nfs",
ServerImage: imageutils.GetE2EImage(imageutils.VolumeNFSServer), ServerImage: imageutils.GetE2EImage(imageutils.VolumeNFSServer),
ServerPorts: []int{2049}, ServerPorts: []int{2049},
ServerVolumes: map[string]string{"": "/exports"},
} }
if len(args) > 0 { if len(args) > 0 {
config.ServerArgs = args config.ServerArgs = args
...@@ -230,9 +232,13 @@ func StartVolumeServer(client clientset.Interface, config VolumeTestConfig) *v1. ...@@ -230,9 +232,13 @@ func StartVolumeServer(client clientset.Interface, config VolumeTestConfig) *v1.
for src, dst := range config.ServerVolumes { for src, dst := range config.ServerVolumes {
mountName := fmt.Sprintf("path%d", i) mountName := fmt.Sprintf("path%d", i)
volumes[i].Name = mountName volumes[i].Name = mountName
if src == "" {
volumes[i].VolumeSource.EmptyDir = &v1.EmptyDirVolumeSource{Medium: v1.StorageMediumMemory}
} else {
volumes[i].VolumeSource.HostPath = &v1.HostPathVolumeSource{ volumes[i].VolumeSource.HostPath = &v1.HostPathVolumeSource{
Path: src, Path: src,
} }
}
mounts[i].Name = mountName mounts[i].Name = mountName
mounts[i].ReadOnly = false mounts[i].ReadOnly = false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment