Skip to content

Commit

Permalink
Update to use kustomize in run-e2e-test
Browse files Browse the repository at this point in the history
  • Loading branch information
Cheng Pan committed Sep 4, 2019
1 parent 69c7c75 commit 6e58771
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 15 deletions.
2 changes: 1 addition & 1 deletion deploy/kubernetes/overlays/stable/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ images:
newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-attacher
newTag: v1.2.0
- name: quay.io/k8scsi/livenessprobe
newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-livenessprobe
newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-liveness-probe
newTag: v1.1.0
- name: quay.io/k8scsi/csi-node-driver-registrar
newName: 602401143452.dkr.ecr.us-west-2.amazonaws.com/eks/csi-node-driver-registrar
Expand Down
16 changes: 2 additions & 14 deletions hack/run-e2e-test
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ NODES=${GINKGO_NODES:-32}
K8S_VERSION=${K8S_VERSION-1.15.3}
INSTANCE_TYPE=${INSTANCE_TYPE-c4.large}

source $(dirname "${BASH_SOURCE}")/utils/helm.sh

echo "Testing in region: $REGION and zones: $ZONES"

KOPS_DOWNLOAD_URL=https://github.com/kubernetes/kops/releases/download/1.14.0-alpha.1/kops-$OS_ARCH
Expand All @@ -45,8 +43,6 @@ fi

chmod +x $KOPS_PATH

helm::install

echo "Build and push test driver image"
eval $(aws ecr get-login --region $REGION --no-include-email)
AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
Expand Down Expand Up @@ -87,15 +83,7 @@ while [[ 1 ]]; do
done;

echo "Deploying driver"
helm::init

helm install --name aws-ebs-csi-driver \
--set enableVolumeScheduling=true \
--set enableVolumeResizing=true \
--set enableVolumeSnapshot=true \
--set image.repository=$IMAGE_NAME \
--set image.tag=$IMAGE_TAG \
./aws-ebs-csi-driver
kubectl apply -k deploy/kubernetes/overlays/alpha

# Run the test
if [[ "$GINKGO_FOCUS" == "\[ebs-csi-migration\]" ]]; then
Expand Down Expand Up @@ -138,7 +126,7 @@ else
fi

echo "Removing driver"
helm del --purge aws-ebs-csi-driver
kubectl delete -k deploy/kubernetes/overlays/alpha

echo "Deleting cluster $CLUSTER_NAME"
$KOPS_PATH delete cluster --name $CLUSTER_NAME.k8s.local --state $KOPS_STATE_FILE --yes
Expand Down

0 comments on commit 6e58771

Please sign in to comment.