From ceb2de293957f3f7f4394018022a7aeac84c2519 Mon Sep 17 00:00:00 2001
From: Jing Xu <jinxu@google.com>
Date: Thu, 3 Nov 2016 10:00:57 -0700
Subject: [PATCH] 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.
---
 test/e2e/volumes.go                       | 2 +-
 test/images/volumes-tester/nfs/Dockerfile | 2 ++
 test/images/volumes-tester/nfs/Makefile   | 2 +-
 test/images/volumes-tester/nfs/run_nfs.sh | 5 ++---
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/test/e2e/volumes.go b/test/e2e/volumes.go
index b67608d68f0..335ad406aea 100644
--- a/test/e2e/volumes.go
+++ b/test/e2e/volumes.go
@@ -370,7 +370,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
 			config := VolumeTestConfig{
 				namespace:   namespace.Name,
 				prefix:      "nfs",
-				serverImage: "gcr.io/google_containers/volume-nfs:0.6",
+				serverImage: "gcr.io/google_containers/volume-nfs:0.8",
 				serverPorts: []int{2049},
 			}
 
diff --git a/test/images/volumes-tester/nfs/Dockerfile b/test/images/volumes-tester/nfs/Dockerfile
index 87c329f599f..f6ac8d1d99a 100644
--- a/test/images/volumes-tester/nfs/Dockerfile
+++ b/test/images/volumes-tester/nfs/Dockerfile
@@ -20,6 +20,8 @@ ADD run_nfs.sh /usr/local/bin/
 ADD index.html /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 2049/tcp 20048/tcp
 
diff --git a/test/images/volumes-tester/nfs/Makefile b/test/images/volumes-tester/nfs/Makefile
index adc7d0ce501..bb4ac1c74ff 100644
--- a/test/images/volumes-tester/nfs/Makefile
+++ b/test/images/volumes-tester/nfs/Makefile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-TAG = 0.7
+TAG = 0.8
 PREFIX = gcr.io/google_containers
 
 all: push
diff --git a/test/images/volumes-tester/nfs/run_nfs.sh b/test/images/volumes-tester/nfs/run_nfs.sh
index e9c84fd254f..7b760572d15 100755
--- a/test/images/volumes-tester/nfs/run_nfs.sh
+++ b/test/images/volumes-tester/nfs/run_nfs.sh
@@ -49,13 +49,12 @@ function start()
 
     mount -t nfsd nfds /proc/fs/nfsd
 
-    # -N 4.x: disable NFSv4
     # -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
     # -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
     echo "NFS started"
 }