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 test for mismatched usage of filesystem/block volumes #79796

Merged
merged 2 commits into from
Aug 15, 2019
Merged

Add test for mismatched usage of filesystem/block volumes #79796

merged 2 commits into from
Aug 15, 2019

Conversation

jsafrane
Copy link
Member

@jsafrane jsafrane commented Jul 4, 2019 •
edited
Loading

/kind feature
/sig storage

What this PR does / why we need it:
This test checks that a block PV cannot be used as volumeMount in a pod and a filesystem PV can't be used as deviceMount.

Which issue(s) this PR fixes:
Part of #74545

Does this PR introduce a user-facing change?:

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. kind/feature Categorizes issue or PR as related to a new feature. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/kubectl area/test sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Jul 4, 2019
@jsafrane
Copy link
Member Author

jsafrane commented Jul 4, 2019

@msau42, @mkimuram, PTAL. Also notice that the test is already useful, I found #79794.

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 4, 2019
@jsafrane jsafrane changed the title WIP: Add test for mismatched usage of filesystem/block volumes Add test for mismatched usage of filesystem/block volumes Jul 8, 2019
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 8, 2019
@jsafrane
Copy link
Member Author

jsafrane commented Jul 8, 2019

Removed WIP, the test is already useful. It's only slow because there is no fast way how to detect that a pod can't be started because of mismatched volume mode.

It's related to #74545.

@jsafrane jsafrane mentioned this pull request Jul 8, 2019
Closed
4 tasks
@mkimuram mkimuram mentioned this pull request Jul 8, 2019
Merged
mkimuram
mkimuram reviewed Jul 8, 2019
View reviewed changes
Copy link
Contributor

@mkimuram mkimuram left a comment

Choose a reason for hiding this comment

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

@jsafrane

Thank you for adding tests for block volmue.
It almost looks good to me. Let me leave some minor comments that won't be necessary to be changed.

test/e2e/storage/testsuites/volumemode.go Outdated Show resolved Hide resolved
test/e2e/storage/testsuites/volumemode.go Outdated Show resolved Hide resolved
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 17, 2019
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 18, 2019
@jsafrane
Copy link
Member Author

/retest

@k8s-ci-robot k8s-ci-robot removed the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 19, 2019
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jul 19, 2019
@jsafrane jsafrane mentioned this pull request Jul 19, 2019
Merged
@jsafrane
Copy link
Member Author

/retest

@jsafrane jsafrane force-pushed the block-test-mismatch branch 3 times, most recently from 2a42830 to 764ebe3 Compare August 8, 2019 14:05
mkimuram
mkimuram reviewed Aug 8, 2019
View reviewed changes
test/e2e/storage/testsuites/volumemode.go
}
err = e2epod.WaitTimeoutForPodEvent(l.cs, pod.Name, l.ns.Name, eventSelector, msg, framework.PodStartTimeout)
// Events are unreliable, don't depend on the event. It's used only to speed up the test.
if err != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

Very good idea to speed up tests without any risks of flake! Let's apply similar way to other places to speed up tests later in another commit.

test/e2e/storage/testsuites/volumemode.go Outdated

// Check the pod is still not running
p, err := l.cs.CoreV1().Pods(l.ns.Name).Get(pod.Name, metav1.GetOptions{})
framework.ExpectError(err, "could not re-read the pod after event (or timeout)")
Copy link
Contributor

Choose a reason for hiding this comment

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

It should be ExpectNoError not ExpectError, then all tests should pass.

Copy link
Member Author

Choose a reason for hiding this comment

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

good catch :-)

mkimuram
mkimuram reviewed Aug 8, 2019
View reviewed changes
test/e2e/storage/testsuites/volumemode.go Outdated

var msg string
if pattern.VolMode == v1.PersistentVolumeBlock {
msg = fmt.Sprintf("has volumeMode Block, but is specified in volumeMounts")
Copy link
Contributor

Choose a reason for hiding this comment

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

fmt.Sprintf is not needed here and the one in else clause.

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

test/e2e/storage/testsuites/volumemode.go Outdated
// Check the pod is still not running
p, err := l.cs.CoreV1().Pods(l.ns.Name).Get(pod.Name, metav1.GetOptions{})
framework.ExpectError(err, "could not re-read the pod after event (or timeout)")
gomega.Expect(p.Status.Phase).To(gomega.Equal(v1.PodPending))
Copy link
Contributor

Choose a reason for hiding this comment

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

It would be better to replace with framework.ExpectEqual(p.Status.Phase, v1.PodPending ...

Copy link
Member Author

Choose a reason for hiding this comment

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

fixed

@mkimuram mkimuram mentioned this pull request Aug 8, 2019
Merged
@jsafrane jsafrane force-pushed the block-test-mismatch branch 2 times, most recently from dd4e319 to 40b1867 Compare August 9, 2019 08:40
@mkimuram
Copy link
Contributor

mkimuram commented Aug 9, 2019

/test pull-kubernetes-e2e-gce-csi-serial

@mkimuram
Copy link
Contributor

mkimuram commented Aug 9, 2019

It looks good to me now.

@msau42

Could you also take a look just in case?

@msau42
Copy link
Member

msau42 commented Aug 12, 2019

/assign

@msau42
Copy link
Member

msau42 commented Aug 13, 2019

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 13, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane, msau42

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

7 similar comments
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@k8s-ci-robot k8s-ci-robot merged commit 0d579bf into kubernetes:master Aug 15, 2019
@k8s-ci-robot k8s-ci-robot added this to the v1.16 milestone Aug 15, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkimuram mkimuram mkimuram left review comments

@dshulyak dshulyak Awaiting requested review from dshulyak

@jeffvance jeffvance Awaiting requested review from jeffvance

Assignees

@msau42 msau42

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubectl area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note-none Denotes a PR that doesn't merit a release note. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/storage Categorizes an issue or PR as relevant to SIG Storage. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.16
Development

Successfully merging this pull request may close these issues.
5 participants
@jsafrane @mkimuram @msau42 @k8s-ci-robot @fejta-bot