Revert "Modify GCI mounter to enable NFSv3"

test/e2e/common/volumes.go

@@ -360,7 +360,7 @@ var _ = framework.KubeDescribe("GCP Volumes", func() {
 	})
 
 	////////////////////////////////////////////////////////////////////////
-	// NFSv4
+	// NFS
 	////////////////////////////////////////////////////////////////////////
 
 	framework.KubeDescribe("NFSv4", func() {
@@ -393,40 +393,6 @@ var _ = framework.KubeDescribe("GCP Volumes", func() {
 		})
 	})
 
-	////////////////////////////////////////////////////////////////////////
-	// NFSv3
-	////////////////////////////////////////////////////////////////////////
-
-	framework.KubeDescribe("NFSv3", func() {
-		It("should be mountable for NFSv3", func() {
-			config := VolumeTestConfig{
-				namespace:   namespace.Name,
-				prefix:      "nfs",
-				serverImage: "gcr.io/google_containers/volume-nfs:0.8",
-				serverPorts: []int{2049, 20048},
-			}
-
-			defer func() {
-				if clean {
-					volumeTestCleanup(f, config)
-				}
-			}()
-			pod := startVolumeServer(f, config)
-			serverIP := pod.Status.PodIP
-			framework.Logf("NFS server IP address: %v", serverIP)
-
-			volume := api.VolumeSource{
-				NFS: &api.NFSVolumeSource{
-					Server:   serverIP,
-					Path:     "/exports",
-					ReadOnly: true,
-				},
-			}
-			// Must match content of test/images/volumes-tester/nfs/index.html
-			testVolumeClient(f, config, volume, nil, "Hello from NFS!")
-		})
-	})
-
 	////////////////////////////////////////////////////////////////////////
 	// Gluster
 	////////////////////////////////////////////////////////////////////////

test/e2e_node/jenkins/gci-init.yaml

@@ -8,5 +8,5 @@ runcmd:
   - mount -B -o remount,exec /home/kubernetes/bin 
   - wget https://storage.googleapis.com/kubernetes-release/rkt/v1.18.0/rkt -O /home/kubernetes/bin/rkt
   - wget https://storage.googleapis.com/kubernetes-release/rkt/v1.18.0/stage1-fly.aci -O /home/kubernetes/bin/stage1-fly.aci
-  - wget https://storage.googleapis.com/kubernetes-release/gci-mounter/gci-mounter-v3.aci -O /home/kubernetes/bin/gci-mounter-v3.aci
+  - wget https://storage.googleapis.com/kubernetes-release/gci-mounter/gci-mounter-v2.aci -O /home/kubernetes/bin/gci-mounter-v2.aci
   - chmod a+x /home/kubernetes/bin/rkt