Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add migration upgrade/downgrade test #927

Merged
merged 2 commits into from Jun 25, 2021
Merged

Add migration upgrade/downgrade test #927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7aed0f2
Set actual cluster name as k8s-tag-cluster-id instead of dummy value
wongma7 Jun 18, 2021
b40a0a2
Add migration upgrade/downgrade test
wongma7 Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Expand Up @@ -77,6 +77,7 @@ test-sanity:
test-e2e-single-az:
AWS_REGION=us-west-2 \
AWS_AVAILABILITY_ZONES=us-west-2a \
HELM_EXTRA_FLAGS='--set=controller.k8sTagClusterId=$$CLUSTER_NAME' \
TEST_PATH=./tests/e2e/... \
GINKGO_FOCUS="\[ebs-csi-e2e\] \[single-az\]" \
GINKGO_SKIP="\"sc1\"|\"st1\"" \
Expand All @@ -86,6 +87,7 @@ test-e2e-single-az:
test-e2e-multi-az:
AWS_REGION=us-west-2 \
AWS_AVAILABILITY_ZONES=us-west-2a,us-west-2b,us-west-2c \
HELM_EXTRA_FLAGS='--set=controller.k8sTagClusterId=$$CLUSTER_NAME' \
TEST_PATH=./tests/e2e/... \
GINKGO_FOCUS="\[ebs-csi-e2e\] \[multi-az\]" \
./hack/e2e/run.sh
Expand All @@ -94,6 +96,7 @@ test-e2e-multi-az:
test-e2e-migration:
AWS_REGION=us-west-2 \
AWS_AVAILABILITY_ZONES=us-west-2a,us-west-2b,us-west-2c \
HELM_EXTRA_FLAGS='--set=controller.k8sTagClusterId=$$CLUSTER_NAME' \
TEST_PATH=./tests/e2e-kubernetes/... \
GINKGO_FOCUS="\[ebs-csi-migration\]" \
EBS_CHECK_MIGRATION=true \
Expand All @@ -103,6 +106,7 @@ test-e2e-migration:
test-e2e-external:
AWS_REGION=us-west-2 \
AWS_AVAILABILITY_ZONES=us-west-2a,us-west-2b,us-west-2c \
HELM_EXTRA_FLAGS='--set=controller.k8sTagClusterId=$$CLUSTER_NAME' \
TEST_PATH=./tests/e2e-kubernetes/... \
GINKGO_FOCUS="External.Storage" \
GINKGO_SKIP="\[Disruptive\]|\[Serial\]" \
Expand All @@ -113,6 +117,7 @@ test-e2e-external-eks:
CLUSTER_TYPE=eksctl \
K8S_VERSION="1.20" \
HELM_VALUES_FILE="./hack/values_eksctl.yaml" \
HELM_EXTRA_FLAGS='--set=controller.k8sTagClusterId=$$CLUSTER_NAME' \
EKSCTL_ADMIN_ROLE="Infra-prod-KopsDeleteAllLambdaServiceRoleF1578477-1ELDFIB4KCMXV" \
AWS_REGION=us-west-2 \
AWS_AVAILABILITY_ZONES=us-west-2a,us-west-2b \
Expand Down
4 changes: 3 additions & 1 deletion hack/e2e/run.sh
View file
Open in desktop
Expand Up @@ -61,6 +61,7 @@ EKSCTL_PATCH_FILE=${EKSCTL_PATCH_FILE:-./hack/eksctl-patch.yaml}
EKSCTL_ADMIN_ROLE=${EKSCTL_ADMIN_ROLE:-}

HELM_VALUES_FILE=${HELM_VALUES_FILE:-./hack/values.yaml}
HELM_EXTRA_FLAGS=${HELM_EXTRA_FLAGS:-}

TEST_PATH=${TEST_PATH:-"./tests/e2e/..."}
ARTIFACTS=${ARTIFACTS:-"${TEST_DIR}/artifacts"}
Expand Down Expand Up @@ -155,8 +156,9 @@ HELM_ARGS=(upgrade --install "${DRIVER_NAME}"
if test -f "$HELM_VALUES_FILE"; then
HELM_ARGS+=(-f "${HELM_VALUES_FILE}")
fi
eval "EXPANDED_HELM_EXTRA_FLAGS=$HELM_EXTRA_FLAGS"
set -x
"${HELM_BIN}" "${HELM_ARGS[@]}"
"${HELM_BIN}" "${HELM_ARGS[@]}" "${EXPANDED_HELM_EXTRA_FLAGS}"
set +x

if [[ -r "${EBS_SNAPSHOT_CRD}" ]]; then
Expand Down
1 change: 0 additions & 1 deletion hack/values.yaml
View file
Open in desktop
@@ -1,6 +1,5 @@
enableVolumeSnapshot: true
controller:
k8sTagClusterId: test
logLevel: 5
node:
logLevel: 5
1 change: 1 addition & 0 deletions tests/e2e-upgrade/README.md
View file
Open in desktop
@@ -0,0 +1 @@
Test the AWS EBS CSI driver before/during/after the CSIMigration and CSIMigrationAWS features are enabled/disabled. For details see (https://github.com/kubernetes/enhancements/tree/master/keps/sig-storage/625-csi-migration#upgradedowngradeskew-testing)