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

UPSTREAM: 52168: Fix incorrect status msg in podautoscaler #16664

Merged
merged 1 commit into from
Oct 8, 2017
Merged

UPSTREAM: 52168: Fix incorrect status msg in podautoscaler #16664

merged 1 commit into from
Oct 8, 2017

Conversation

DirectXMan12
Copy link
Contributor

@DirectXMan12 DirectXMan12 commented Oct 3, 2017 •
edited
Loading

This cherry-picks kubernetes/kubernetes#52168. It is mainly a cosmetic issue, as the fix changes the HPA status conditions to convey better information, but the initial information was not technically incorrect.

Fixes bug 1493347
https://bugzilla.redhat.com/show_bug.cgi?id=1493347

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

cc @sjenning

@sjenning
Copy link
Contributor

sjenning commented Oct 3, 2017

/lgtm

@derekwaynecarr can you review/approve?

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 3, 2017
@sjenning sjenning added the kind/bug Categorizes issue or PR as related to a bug. label Oct 3, 2017
@derekwaynecarr
Copy link
Member

/approve
/lgtm

@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 4, 2017
@sjenning sjenning mentioned this pull request Oct 4, 2017
Merged
@deads2k
Copy link
Contributor

deads2k commented Oct 4, 2017

Holding per [aos-devel] Holding upstream commit until rebase lands

@soltysh
Copy link
Contributor

soltysh commented Oct 5, 2017

Rebase landed, removing do-not-merge.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 5, 2017
@mattjmcnaughton @DirectXMan12
UPSTREAM: 52168: Fix incorrect status msg in podautoscaler
6de1772 
Fix #49256

When `ScalingLimited = true` for the `hpa`, there is an accompanying
status message, describing why scaling is limited. Previously if the desired
replica count was 0, and spec.minReplicas > 0, the status message
indicated "the desired replica count was less than the min replica
count". This was particularly confusing when `spec.MinReplicas = 1`. If
there was no `spec.minReplicas`, then the status message indicated "the
desired replica count was zero" which is more informative.

Update the calculation of status message so that if the desired replica
count is 0, we always display the clearer "the desired replica count was
zero" status message, even if spec.minReplicas > 0.

Signed-off-by: mattjmcnaughton <[email protected]>
@DirectXMan12 DirectXMan12 force-pushed the cherry-pick/fix-incorrect-hpa-status branch from 6294127 to 6de1772 Compare October 6, 2017 15:10
@openshift-ci-robot openshift-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 6, 2017
@openshift-merge-robot openshift-merge-robot removed lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Oct 6, 2017
@sjenning
Copy link
Contributor

sjenning commented Oct 6, 2017

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 6, 2017
@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, DirectXMan12, sjenning

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

@sjenning
Copy link
Contributor

sjenning commented Oct 6, 2017

/test integration

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@sjenning
Copy link
Contributor

sjenning commented Oct 7, 2017

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@sjenning
Copy link
Contributor

sjenning commented Oct 7, 2017

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue.

@openshift-merge-robot openshift-merge-robot merged commit c0dc4a1 into openshift:master Oct 8, 2017
@DirectXMan12 DirectXMan12 deleted the cherry-pick/fix-incorrect-hpa-status branch October 18, 2017 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@DirectXMan12 DirectXMan12

@sjenning sjenning

@derekwaynecarr derekwaynecarr

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@DirectXMan12 @sjenning @derekwaynecarr @deads2k @soltysh @openshift-merge-robot @openshift-bot @openshift-ci-robot @mattjmcnaughton