Skip to content

Skip volume expansion test for node skew tests #685

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

Merged
merged 1 commit into from
Dec 16, 2020
Merged

Skip volume expansion test for node skew tests #685

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions test/k8s-integration/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,12 @@ func generateGCETestSkip(testParams *testParameters) string {
if v.LessThan(apimachineryversion.MustParseSemantic("1.16.0")) {
skipString = skipString + "|volumeMode\\sshould\\snot\\smount\\s/\\smap\\sunused\\svolumes\\sin\\sa\\spod"
}

// ExpandCSIVolumes feature is beta in k8s 1.16
if v.LessThan(apimachineryversion.MustParseSemantic("1.16.0")) {
skipString = skipString + "|allowExpansion"
}

if v.LessThan(apimachineryversion.MustParseSemantic("1.17.0")) {
skipString = skipString + "|VolumeSnapshotDataSource"
}
Expand All @@ -536,7 +542,7 @@ func generateGKETestSkip(testParams *testParameters) string {
// "volumeMode should not mount / map unused volumes in a pod" tests a
// (https://github.com/kubernetes/kubernetes/pull/81163)
// bug-fix introduced in 1.16
if curVer.lessThan(mustParseVersion("1.16.0")) {
if curVer.lessThan(mustParseVersion("1.16.0")) || (nodeVer != nil && nodeVer.lessThan(mustParseVersion("1.16.0"))) {
skipString = skipString + "|volumeMode\\sshould\\snot\\smount\\s/\\smap\\sunused\\svolumes\\sin\\sa\\spod"
}

Expand All @@ -545,9 +551,11 @@ func generateGKETestSkip(testParams *testParameters) string {
skipString = skipString + "|fsgroupchangepolicy"
}

// ExpandCSIVolumes feature is beta in k8s 1.16
// For GKE deployed PD CSI driver, resizer sidecar is enabled in 1.16.8-gke.3
if (testParams.useGKEManagedDriver && curVer.lessThan(mustParseVersion("1.16.8-gke.3"))) ||
(!testParams.useGKEManagedDriver && curVer.lessThan(mustParseVersion("1.16.0"))) {
(!testParams.useGKEManagedDriver && curVer.lessThan(mustParseVersion("1.16.0")) ||
(nodeVer != nil && nodeVer.lessThan(mustParseVersion("1.16.0")))) {
skipString = skipString + "|allowExpansion"
}

Expand Down