diff --git a/deploy/kubernetes/manifest.yaml b/deploy/kubernetes/manifest.yaml index 834ed5ae29..844159b9bb 100644 --- a/deploy/kubernetes/manifest.yaml +++ b/deploy/kubernetes/manifest.yaml @@ -24,6 +24,12 @@ rules: - apiGroups: [""] resources: ["events"] verbs: ["get", "list", "watch", "create", "update", "patch"] + - apiGroups: ["storage.k8s.io"] + resources: ["csinodes"] + verbs: ["get", "list", "watch"] + - apiGroups: [""] + resources: ["nodes"] + verbs: ["get", "list", "watch"] --- @@ -224,7 +230,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-provisioner - image: quay.io/k8scsi/csi-provisioner:v1.0.1 + image: quay.io/k8scsi/csi-provisioner:v1.1.0 args: - --provisioner=ebs.csi.aws.com - --csi-address=$(ADDRESS) @@ -237,7 +243,7 @@ spec: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ - name: csi-attacher - image: quay.io/k8scsi/csi-attacher:v1.0.1 + image: quay.io/k8scsi/csi-attacher:v1.1.0 args: - --csi-address=$(ADDRESS) - --v=5 @@ -248,7 +254,7 @@ spec: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ - name: csi-snapshotter - image: quay.io/k8scsi/csi-snapshotter:v1.0.1 + image: quay.io/k8scsi/csi-snapshotter:v1.1.0 args: - --csi-address=$(ADDRESS) - --connection-timeout=15s @@ -259,7 +265,7 @@ spec: - name: socket-dir mountPath: /var/lib/csi/sockets/pluginproxy/ - name: liveness-probe - image: quay.io/k8scsi/livenessprobe:v1.0.2 + image: quay.io/k8scsi/livenessprobe:v1.1.0 args: - --csi-address=/csi/csi.sock - --connection-timeout=3s @@ -324,7 +330,7 @@ spec: periodSeconds: 10 failureThreshold: 5 - name: node-driver-registrar - image: quay.io/k8scsi/csi-node-driver-registrar:v1.0.2 + image: quay.io/k8scsi/csi-node-driver-registrar:v1.1.0 args: - --csi-address=$(ADDRESS) - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) @@ -344,7 +350,7 @@ spec: - name: registration-dir mountPath: /registration - name: liveness-probe - image: quay.io/k8scsi/livenessprobe:v1.0.2 + image: quay.io/k8scsi/livenessprobe:v1.1.0 args: - --csi-address=/csi/csi.sock - --connection-timeout=3s diff --git a/hack/run-e2e-test b/hack/run-e2e-test index f3dffd61b4..1f956bc5a5 100755 --- a/hack/run-e2e-test +++ b/hack/run-e2e-test @@ -25,10 +25,11 @@ REGION=${AWS_REGION-us-east-1} ZONES=${AWS_AVAILABILITY_ZONES-us-east-1a,us-east-1b,us-east-1c} FOCUS=${GINKGO_FOCUS-"[ebs-csi-e2e]"} NODES=${GINKGO_NODES:-32} +K8S_VERSION=${K8S_VERSION-1.14.0} echo "Testing in region: $REGION and zones: $ZONES" -KOPS_DOWNLOAD_URL=https://github.com/kubernetes/kops/releases/download/1.11.0/kops-$OS_ARCH +KOPS_DOWNLOAD_URL=https://github.com/kubernetes/kops/releases/download/1.14.0-alpha.1/kops-$OS_ARCH KOPS_PATH=$TEST_DIR/kops KOPS_STATE_FILE=s3://k8s-kops-csi-e2e @@ -49,7 +50,7 @@ ssh-keygen -P csi-e2e -f $SSH_KEY_PATH $KOPS_PATH create cluster --state $KOPS_STATE_FILE \ --zones $ZONES \ --node-count=3 \ - --kubernetes-version=1.13.0 \ + --kubernetes-version=$K8S_VERSION \ --ssh-public-key=$SSH_KEY_PATH.pub \ $CLUSTER_NAME.k8s.local $KOPS_PATH get cluster --state $KOPS_STATE_FILE $CLUSTER_NAME.k8s.local -o yaml > $CLUSTER_YAML_PATH @@ -83,7 +84,6 @@ cp deploy/kubernetes/*.yaml $TEST_DIR sed "s/image: amazon\/aws-ebs-csi-driver:.*/image: $AWS_ACCOUNT_ID.dkr.ecr.$REGION.amazonaws.com\/aws-ebs-csi-driver:$IMAGE_TAG/g" -i $TEST_DIR/manifest.yaml echo "Deploying driver" -kubectl create -f https://raw.githubusercontent.com/kubernetes/csi-api/release-1.13/pkg/crd/manifests/csinodeinfo.yaml --validate=false kubectl apply -f $TEST_DIR/manifest.yaml # Run the test