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.

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

Support v1.22 e2e #420

Merged
merged 11 commits into from
Feb 7, 2022
Merged

Support v1.22 e2e #420

merged 11 commits into from
Feb 7, 2022

Conversation

CollinShoop
Copy link
Contributor

@CollinShoop CollinShoop commented Jan 10, 2022

CON-4800

  • vendored 22.5 dependencies
  • add 1.22 version support
  • upgrade base alpine from 3.11 -> 3.15 (optional, just keeping things up date)
  • added missing controller patch permissions requirements that were missing (see under breaking changes)
  • added ginkgo skip for [Feature:VolumeSourceXFS] to avoid problematic tests - this should be removed after 1.22 whenever we have a fix for it.

Vendor changes

go get k8s.io/[email protected]
go get k8s.io/[email protected]
go get k8s.io/utils@master
go mod tidy
go mod vendor
``

@CollinShoop CollinShoop changed the base branch from master to support-v1-snapshots January 10, 2022 17:54
@CollinShoop CollinShoop mentioned this pull request Jan 10, 2022
@CollinShoop CollinShoop changed the title Support kubernetes v1.22 Support v1.22 e2e Jan 10, 2022
@timoreimann timoreimann force-pushed the support-v1-snapshots branch 2 times, most recently from 1f3d613 to d0271cc Compare January 11, 2022 23:04
@timoreimann
Copy link
Contributor

There are some conflicts here. @CollinShoop could it be that your branched off of master in your local checkout as opposed to the support-v1-snapshots branch? If the latter is picked as base, the number of conflicts should be minimal I think.

Base automatically changed from support-v1-snapshots to master January 12, 2022 13:49
@CollinShoop
Copy link
Contributor Author

There are some conflicts here. @CollinShoop could it be that your branched off of master in your local checkout as opposed to the support-v1-snapshots branch? If the latter is picked as base, the number of conflicts should be minimal I think.

I did fork my branch off of support-v1-snapshots but I'm not sure what happened here. Just fixed it.

SupportedSizeRange:
Max: 100Gi
Min: 1Gi
Capabilities:
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@timoreimann How do I know which Capabilities need to be provided?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a bit non-trivial, unfortunately: you basically need to know which capabilities are available in CSI (by reading up on the CSI docs and the CSI spec), which of those our driver supports, and then take a good guess or look at the upstream e2e code to understand what the individual capabilities refer to exactly.

In this case, it's relatively easy since the caps don't seem to have changed between 1.21 and 1.22, so we should be fine copying what we have for 1.21 already.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh.. I was afraid of that. Guess I got lucky though 😅

@@ -68,5 +68,5 @@ if [[ "${SKIP_SEQUENTIAL_TESTS:-}" ]]; then
echo 'Skipping sequential tests'
else
echo 'Running sequential tests'
ginkgo -v -focus="External.Storage${focus}.*(\[Feature:|\[Serial\])" -skip='\[Disruptive\]' "${E2E_TEST_FILE}" -- "-storage.testdriver=${TD_FILE}"
ginkgo -v -focus="External.Storage${focus}.*(\[Feature:|\[Serial\])" -skip='\[Disruptive\]|\[Feature:VolumeSourceXFS\]' "${E2E_TEST_FILE}" -- "-storage.testdriver=${TD_FILE}"
Copy link
Contributor Author

@CollinShoop CollinShoop Feb 4, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needed to avoid new tests that were added with 1.22 that are failing but from manual testing would also fail on 1.21.

@CollinShoop CollinShoop marked this pull request as ready for review February 7, 2022 14:37
@CollinShoop CollinShoop merged commit f9046ba into master Feb 7, 2022
@CollinShoop CollinShoop deleted the support-1.22 branch February 7, 2022 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants