Skip to content
This repository was archived by the owner on Oct 21, 2020. It is now read-only.

Commit 88a48d8

Browse files
authored
Merge pull request #911 from wongma7/leader-election-nfs-e2e
Revamp nfs e2e tests to fork k8s instead of vendoring it and use yamls
2 parents aa3e3c0 + 5fde0d3 commit 88a48d8

19 files changed

+282
-1457
lines changed

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ env:
1313
- TEST_SUITE=osx
1414
- TEST_SUITE=linux-local-volume
1515
- TEST_SUITE=linux-everything-else
16-
- TEST_SUITE=linux-nfs ETCD_VER=v3.0.14 KUBE_VERSION=1.5.4
17-
- TEST_SUITE=linux-nfs ETCD_VER=v3.0.17 KUBE_VERSION=1.6.0
16+
# - TEST_SUITE=linux-nfs ETCD_VER=v3.0.14 KUBE_VERSION=1.5.4
17+
- TEST_SUITE=linux-nfs ETCD_VER=v3.2.18 KUBE_VERSION=1.11.2
1818

1919
before_install:
2020
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then ulimit -n 8192; fi

ceph/cephfs/deploy/rbac/clusterrolebinding.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ kind: ClusterRoleBinding
22
apiVersion: rbac.authorization.k8s.io/v1
33
metadata:
44
name: cephfs-provisioner
5-
namespace: cephfs
65
subjects:
76
- kind: ServiceAccount
87
name: cephfs-provisioner

digitalocean/manifests/rbac/clusterrolebinding.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ kind: ClusterRoleBinding
22
apiVersion: rbac.authorization.k8s.io/v1
33
metadata:
44
name: digitalocean-provisioner
5-
namespace: kube-system
65
subjects:
76
- kind: ServiceAccount
87
name: digitalocean-provisioner

nfs/Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ test:
4646
.PHONY: test
4747

4848
test-e2e:
49-
cd ./test/e2e; glide install -v
50-
go test ./test/e2e -v --kubeconfig=$(HOME)/.kube/config
49+
cd ./test/e2e; ./test.sh
5150
.PHONY: test-e2e
5251

5352
clean:

nfs/deploy/kubernetes/class.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ apiVersion: storage.k8s.io/v1
33
metadata:
44
name: example-nfs
55
provisioner: example.com/nfs
6+
parameters:
7+
mountOptions: "vers=4.1" # TODO: reconcile with StorageClass.mountOptions

nfs/deploy/kubernetes/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
app: nfs-provisioner
2525
---
2626
kind: Deployment
27-
apiVersion: extensions/v1beta1
27+
apiVersion: extensions/v1
2828
metadata:
2929
name: nfs-provisioner
3030
spec:

nfs/deploy/kubernetes/rbac.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ kind: ClusterRoleBinding
3030
apiVersion: rbac.authorization.k8s.io/v1
3131
metadata:
3232
name: run-nfs-provisioner
33-
namespace: default
3433
subjects:
3534
- kind: ServiceAccount
3635
name: nfs-provisioner

nfs/deploy/kubernetes/read-pod.yaml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
kind: Pod
2+
apiVersion: v1
3+
metadata:
4+
name: read-pod
5+
spec:
6+
containers:
7+
- name: read-pod
8+
image: gcr.io/google_containers/busybox:1.24
9+
command:
10+
- "/bin/sh"
11+
args:
12+
- "-c"
13+
- "test -f /mnt/SUCCESS && exit 0 || exit 1"
14+
volumeMounts:
15+
- name: nfs-pvc
16+
mountPath: "/mnt"
17+
restartPolicy: "Never"
18+
volumes:
19+
- name: nfs-pvc
20+
persistentVolumeClaim:
21+
claimName: nfs
22+

nfs/deploy/kubernetes/statefulset.yaml

+5-4
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,22 @@ spec:
2424
app: nfs-provisioner
2525
---
2626
kind: StatefulSet
27-
apiVersion: apps/v1beta1
27+
apiVersion: apps/v1
2828
metadata:
2929
name: nfs-provisioner
3030
spec:
31+
selector:
32+
matchLabels:
33+
app: nfs-provisioner
3134
serviceName: "nfs-provisioner"
3235
replicas: 1
3336
template:
3437
metadata:
3538
labels:
3639
app: nfs-provisioner
37-
annotations:
38-
pod.alpha.kubernetes.io/initialized: "true"
3940
spec:
4041
serviceAccount: nfs-provisioner
41-
terminationGracePeriodSeconds: 0
42+
terminationGracePeriodSeconds: 10
4243
containers:
4344
- name: nfs-provisioner
4445
image: quay.io/kubernetes_incubator/nfs-provisioner:latest
File renamed without changes.

nfs/test/e2e/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/vendor
2+
/src

nfs/test/e2e/e2e_suite_test.go

-35
This file was deleted.

0 commit comments

Comments
 (0)