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

Vpa - Observed containers admission controller annotation #2731

Merged
merged 1 commit into from
Jan 14, 2020
Merged

Vpa - Observed containers admission controller annotation #2731

merged 1 commit into from
Jan 14, 2020

Conversation

krzysied
Copy link
Contributor

Adding vpa observed containers to pods handled by Admission Controller.

ref #2726

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 13, 2020
@krzysied krzysied mentioned this pull request Jan 13, 2020
Closed
@krzysied
Copy link
Contributor Author

/assign @bskiba

bskiba
bskiba reviewed Jan 13, 2020
View reviewed changes
Copy link
Member

@bskiba bskiba left a comment

Choose a reason for hiding this comment

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

One minor comment

vertical-pod-autoscaler/pkg/admission-controller/logic/server_test.go Outdated
lc := limitrange.NewNoopLimitsCalculator()
s := NewAdmissionServer(&frp, &fppp, &fvpp, lc)
patches, _ := s.getPatchesForPodResourceRequest(tc.podJson, "default")
if assert.Equal(t, len(tc.expectPatches), len(patches), fmt.Sprintf("got %+v, want %+v", patches, tc.expectPatches)) {
Copy link
Member

Choose a reason for hiding this comment

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

There is assert.Len (https://godoc.org/github.com/stretchr/testify/assert#Len)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.
I also added assert.NoError for the error returned by getPatchesForPodResourceRequest.

@krzysied krzysied force-pushed the vpa_blessing_admission_controller branch from e004d0b to fbd096b Compare January 13, 2020 15:40
@krzysied
Copy link
Contributor Author

/hold
I will wait with the merge till tomorrow morning. It shouldn't break the e2e, but I want to keep eye on it, when it merges.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 13, 2020
@bskiba
Copy link
Member

bskiba commented Jan 13, 2020

/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 Jan 13, 2020
@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 Jan 13, 2020
@krzysied
Copy link
Contributor Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 14, 2020
@k8s-ci-robot k8s-ci-robot merged commit 59ca051 into kubernetes:master Jan 14, 2020
@krzysied krzysied deleted the vpa_blessing_admission_controller branch January 14, 2020 09:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bskiba bskiba bskiba left review comments

@jbartosik jbartosik Awaiting requested review from jbartosik

@mwielgus mwielgus Awaiting requested review from mwielgus

Assignees

@bskiba bskiba

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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@krzysied @bskiba @k8s-ci-robot