Merge pull request #911 from wongma7/leader-election-nfs-e2e

Revamp nfs e2e tests to fork k8s instead of vendoring it and use yamls

Author: wongma7

.travis.yml

@@ -13,8 +13,8 @@ env:
   - TEST_SUITE=osx
   - TEST_SUITE=linux-local-volume
   - TEST_SUITE=linux-everything-else
-  - TEST_SUITE=linux-nfs ETCD_VER=v3.0.14 KUBE_VERSION=1.5.4
-  - TEST_SUITE=linux-nfs ETCD_VER=v3.0.17 KUBE_VERSION=1.6.0
+#  - TEST_SUITE=linux-nfs ETCD_VER=v3.0.14 KUBE_VERSION=1.5.4
+  - TEST_SUITE=linux-nfs ETCD_VER=v3.2.18 KUBE_VERSION=1.11.2
 
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then ulimit -n 8192; fi

ceph/cephfs/deploy/rbac/clusterrolebinding.yaml

@@ -2,7 +2,6 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: cephfs-provisioner
-  namespace: cephfs
 subjects:
   - kind: ServiceAccount
     name: cephfs-provisioner

digitalocean/manifests/rbac/clusterrolebinding.yaml

@@ -2,7 +2,6 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: digitalocean-provisioner
-  namespace: kube-system
 subjects:
   - kind: ServiceAccount
     name: digitalocean-provisioner

nfs/Makefile

@@ -46,8 +46,7 @@ test:
 .PHONY: test
 
 test-e2e:
-	cd ./test/e2e; glide install -v
-	go test ./test/e2e -v --kubeconfig=$(HOME)/.kube/config
+	cd ./test/e2e; ./test.sh
 .PHONY: test-e2e
 
 clean:

nfs/deploy/kubernetes/class.yaml

@@ -3,3 +3,5 @@ apiVersion: storage.k8s.io/v1
 metadata:
   name: example-nfs
 provisioner: example.com/nfs
+parameters:
+  mountOptions: "vers=4.1"  # TODO: reconcile with StorageClass.mountOptions

nfs/deploy/kubernetes/deployment.yaml

@@ -24,7 +24,7 @@ spec:
     app: nfs-provisioner
 ---
 kind: Deployment
-apiVersion: extensions/v1beta1
+apiVersion: extensions/v1
 metadata:
   name: nfs-provisioner
 spec:

nfs/deploy/kubernetes/rbac.yaml

@@ -30,7 +30,6 @@ kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: run-nfs-provisioner
-  namespace: default
 subjects:
   - kind: ServiceAccount
     name: nfs-provisioner

nfs/deploy/kubernetes/read-pod.yaml

@@ -0,0 +1,22 @@
+kind: Pod
+apiVersion: v1
+metadata:
+  name: read-pod
+spec:
+  containers:
+  - name: read-pod
+    image: gcr.io/google_containers/busybox:1.24
+    command:
+      - "/bin/sh"
+    args:
+      - "-c"
+      - "test -f /mnt/SUCCESS && exit 0 || exit 1"
+    volumeMounts:
+      - name: nfs-pvc
+        mountPath: "/mnt"
+  restartPolicy: "Never"
+  volumes:
+    - name: nfs-pvc
+      persistentVolumeClaim:
+        claimName: nfs
+

nfs/deploy/kubernetes/statefulset.yaml

@@ -24,21 +24,22 @@ spec:
     app: nfs-provisioner
 ---
 kind: StatefulSet
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 metadata:
   name: nfs-provisioner
 spec:
+  selector:
+    matchLabels:
+      app: nfs-provisioner
   serviceName: "nfs-provisioner"
   replicas: 1
   template:
     metadata:
       labels:
         app: nfs-provisioner
-      annotations:
-        pod.alpha.kubernetes.io/initialized: "true"
     spec:
       serviceAccount: nfs-provisioner
-      terminationGracePeriodSeconds: 0
+      terminationGracePeriodSeconds: 10
       containers:
         - name: nfs-provisioner
           image: quay.io/kubernetes_incubator/nfs-provisioner:latest

nfs/deploy/kubernetes/write_pod.yaml nfs/deploy/kubernetes/write-pod.yaml

@@ -1 +1,2 @@
 /vendor
+/src