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 #53690 #53799

Merged
merged 1 commit into from
Oct 17, 2017
Merged

Automated cherry pick of #53690 #53799

merged 1 commit into from
Oct 17, 2017

Conversation

mattjmcnaughton
Copy link
Contributor

Cherry pick of #53690 on release-1.8.

#53690: Fix hpa scaling above max replicas w/ scaleUpLimit

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 12, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @mattjmcnaughton. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 12, 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 Oct 12, 2017
@mattjmcnaughton
Copy link
Contributor Author

mattjmcnaughton commented Oct 12, 2017 •
edited

/assign @MaciekPytel

@piosz piosz assigned jpbetz and MaciekPytel and unassigned piosz and jszczepkowski Oct 12, 2017
@MaciekPytel
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 12, 2017
@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 12, 2017
@MaciekPytel
Copy link
Contributor

@jpbetz - can you approve cherry-pick?

@MaciekPytel
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 12, 2017
@MaciekPytel
Copy link
Contributor

@mattjmcnaughton can you fix the unittest to work on this branch? It looks to be the same problem on both 1.7 and 1.8.

@mattjmcnaughton
Copy link
Contributor Author

@MaciekPytel yup, will take a look at both and fix tonight. Thanks for the heads up!

@mattjmcnaughton
Fix hpa scaling above max replicas w/ scaleUpLimit
22d0a80 
Fix kubernetes#53670

Fix a bug where `desiredReplicas` could be greater than `maxReplicas`
if the original value for `desiredReplicas > scaleUpLimit` and
`scaleUpLimit > maxReplicas`. Previously, when that happened, we would
scale up to `scaleUpLimit`, and then in the next auto-scaling run, scale
down to `maxReplicas`. Address this issue and introduce a regression
test.
@mattjmcnaughton mattjmcnaughton force-pushed the automated-cherry-pick-of-#53690-upstream-release-1.8 branch from 58823cc to 22d0a80 Compare October 13, 2017 12:54
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 13, 2017
@mattjmcnaughton
Copy link
Contributor Author

@MaciekPytel @jpbetz the failing unit test is fixed. I believe this is ready for another look.

@MaciekPytel
Copy link
Contributor

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MaciekPytel, mattjmcnaughton

Associated issue: 53690

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

@jpbetz jpbetz added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Oct 16, 2017
@jpbetz jpbetz added this to the v1.8 milestone Oct 16, 2017
@k8s-github-robot k8s-github-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Oct 16, 2017
@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 6920d3a into kubernetes:release-1.8 Oct 17, 2017
@k8s-ci-robot
Copy link
Contributor

@mattjmcnaughton: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
pull-kubernetes-e2e-gce-gpu 22d0a80 link /test pull-kubernetes-e2e-gce-gpu

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@mattjmcnaughton mattjmcnaughton deleted the automated-cherry-pick-of-#53690-upstream-release-1.8 branch October 18, 2017 00:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jpbetz jpbetz

@MaciekPytel MaciekPytel

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

Successfully merging this pull request may close these issues.

None yet
7 participants
@mattjmcnaughton @k8s-ci-robot @MaciekPytel @k8s-github-robot @jpbetz @piosz @jszczepkowski