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

Cherry limits to 04 #2116

Merged
merged 12 commits into from
Jun 11, 2019

Conversation

jbartosik
Copy link
Collaborator

Cherry pick:

PRs preparing VPA for limit and limit range support:
#1879
#1880
#1950
#1990
PRs implementing support for limits:
#1993
#1997
#1998
#2005

This is analogous to #2105 but this one had conflicts (mostly import changes, one in unit tests)

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jun 11, 2019
@bskiba
Copy link
Member

bskiba commented Jun 11, 2019

There is some import confusion in test. Otherwise lgtm

@jbartosik jbartosik force-pushed the cherry-limits-to-04 branch from a8a16fb to 6608813 Compare June 11, 2019 10:32
jbartosik added 11 commits June 11, 2019 13:26
Conflicts:
	vertical-pod-autoscaler/pkg/admission-controller/logic/server_test.go
The test relied on order of iterating through map.

Conflicts:
	vertical-pod-autoscaler/pkg/admission-controller/logic/server_test.go
- Name test cases,
- Drop duplicated test case,
- Simpler error handling of invalid expected resource amounts,
- Format code more in line with other tests.
Conflicts:
	vertical-pod-autoscaler/pkg/admission-controller/logic/recommendation_provider.go
Conflicts:
	vertical-pod-autoscaler/pkg/admission-controller/logic/recommendation_provider.go
Users should use ContainerResourcePolicy if they want to control VPA
recommendation range.
I think it's useful to revers condtions in the tests when dropping
capping to limits to make sure are the relevant code is gone. I don't
think it's an useful test to keep around.
Except when proportion is huge and recommendation is huge which would
result in milli limit exceeding int64 maximum. Then cap the limit milli
value to int63 max.

Conflicts:
	vertical-pod-autoscaler/pkg/admission-controller/logic/recommendation_provider.go
@bskiba
Copy link
Member

bskiba commented Jun 11, 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 Jun 11, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bskiba

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 11, 2019
@k8s-ci-robot k8s-ci-robot merged commit 2d7ed7f into kubernetes:vpa-release-0.4 Jun 11, 2019
@jbartosik jbartosik deleted the cherry-limits-to-04 branch June 11, 2019 13:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants