github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Enable NFS volume test 

This PR fixes the dockerfile for NFS server image and enable NFSv4.
After using containeried mounts approach on GCI, this test should pass.
pull/6/head
Jing Xu 2016-11-03 10:00:57 -07:00
parent bcfb4366e3
commit ceb2de2939
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/volumes.go
View File

@ -370,7 +370,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
config := VolumeTestConfig{ config := VolumeTestConfig{
namespace: namespace.Name, namespace: namespace.Name,
prefix: "nfs", prefix: "nfs",
serverImage: "gcr.io/google_containers/volume-nfs:0.6", serverImage: "gcr.io/google_containers/volume-nfs:0.8",
serverPorts: []int{2049}, serverPorts: []int{2049},
} }

2
test/images/volumes-tester/nfs/Dockerfile
View File

@ -20,6 +20,8 @@ ADD run_nfs.sh /usr/local/bin/
ADD index.html /tmp/index.html ADD index.html /tmp/index.html
RUN chmod 644 /tmp/index.html RUN chmod 644 /tmp/index.html
# mark /exports as a mount point
VOLUME /exports
# expose mountd 20048/tcp and nfsd 2049/tcp # expose mountd 20048/tcp and nfsd 2049/tcp
EXPOSE 2049/tcp 20048/tcp EXPOSE 2049/tcp 20048/tcp

2
test/images/volumes-tester/nfs/Makefile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
TAG = 0.7 TAG = 0.8
PREFIX = gcr.io/google_containers PREFIX = gcr.io/google_containers
all: push all: push

5
test/images/volumes-tester/nfs/run_nfs.sh
View File

@ -49,13 +49,12 @@ function start()
mount -t nfsd nfds /proc/fs/nfsd mount -t nfsd nfds /proc/fs/nfsd
# -N 4.x: disable NFSv4
# -V 3: enable NFSv3 # -V 3: enable NFSv3
/usr/sbin/rpc.mountd -N 2 -V 3 -N 4 -N 4.1 /usr/sbin/rpc.mountd -N 2 -V 3
/usr/sbin/exportfs -r /usr/sbin/exportfs -r
# -G 10 to reduce grace time to 10 seconds (the lowest allowed) # -G 10 to reduce grace time to 10 seconds (the lowest allowed)
/usr/sbin/rpc.nfsd -G 10 -N 2 -V 3 -N 4 -N 4.1 2 /usr/sbin/rpc.nfsd -G 10 -N 2 -V 3
/usr/sbin/rpc.statd --no-notify /usr/sbin/rpc.statd --no-notify
echo "NFS started" echo "NFS started"
} }