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

Automated cherry pick of #56577 #56966

Merged
merged 3 commits into from
Dec 17, 2017
Merged

Automated cherry pick of #56577 #56966

merged 3 commits into from
Dec 17, 2017

Conversation

resouer
Copy link
Contributor

@resouer resouer commented Dec 8, 2017 •
edited
Loading

Cherry pick of #56577 on release-1.8.

#56577: Fix PV counter predicate in eclass

fixes: #54370

@k8s-ci-robot k8s-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Dec 8, 2017
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Dec 8, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 8, 2017
@resouer resouer force-pushed the automated-cherry-pick-of-#56577-upstream-release-1.8 branch from f27cd95 to b7689a9 Compare December 8, 2017 17:32
@resouer
Copy link
Contributor Author

resouer commented Dec 10, 2017

cc @msau42 @bsalamat Please take a review this cherry pick for 1.8 whenever you are free.

@jpbetz jpbetz added approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Dec 11, 2017
msau42
msau42 reviewed Dec 11, 2017
View reviewed changes
plugin/pkg/scheduler/algorithm/predicates/testing_helper.go Outdated
return nil, fmt.Errorf("Unable to find persistent volume: %s", pvID)
}

type FakeStorageClassInfo []storagev1.StorageClass
Copy link
Member

Choose a reason for hiding this comment

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

in 1.8, scheduler doesn't know about storageclass, so this can be removed

plugin/pkg/scheduler/factory/factory.go
invalidPredicates := sets.NewString(maxPDVolumeCountPredicateKeys...)

// The bound volume's label may change
invalidPredicates.Insert("NoVolumeZoneConflict")
Copy link
Member

Choose a reason for hiding this comment

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

You also need to invalidate the NoVolumeNodeConflict predicate under the LocalPersistentVolumes feature gate for PVC delete.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, just fixed.

Add pvc as part of equivalence hash
431d2f4 
Use factory to generat get equivalence pod func

Fix NoVolumeNodeConflict
@resouer resouer force-pushed the automated-cherry-pick-of-#56577-upstream-release-1.8 branch from b7689a9 to 1d1060f Compare December 12, 2017 06:12
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 12, 2017
@resouer resouer force-pushed the automated-cherry-pick-of-#56577-upstream-release-1.8 branch from 1d1060f to 80b84fa Compare December 12, 2017 06:23
@resouer
Copy link
Contributor Author

resouer commented Dec 12, 2017

/test pull-kubernetes-e2e-kops-aws

@resouer
Copy link
Contributor Author

resouer commented Dec 12, 2017

/test pull-kubernetes-verify

@msau42
Copy link
Member

msau42 commented Dec 12, 2017

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

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

Associated issue: #56577

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your 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.

4 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.

@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.

@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.

@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.

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit c2c5c13 into kubernetes:release-1.8 Dec 17, 2017
@resouer resouer deleted the automated-cherry-pick-of-#56577-upstream-release-1.8 branch December 18, 2017 00:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@msau42 msau42 msau42 left review comments

Assignees

@timothysc timothysc

@bsalamat bsalamat

@msau42 msau42

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@resouer @msau42 @k8s-ci-robot @fejta-bot @k8s-github-robot @timothysc @jpbetz @bsalamat