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

Fix deploymentconfig scale #17520

Merged
merged 2 commits into from
Dec 6, 2017
Merged

Fix deploymentconfig scale #17520

merged 2 commits into from
Dec 6, 2017

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Nov 29, 2017 •
edited
Loading

3.6 and 3.7 shipped with the /apis/apps.openshift.io/deploymentconfigs/scale subresource returning apps.openshift.io/v1 Scale objects

This is a non-standard Scale object that the HPA will never be able to make use of.

The intent was to continue send the same thing as /oapi/v1/deploymentconfigs/scale: extensions/v1beta1 Scale objects

This PR fixes the groupified API to send/receive the correct type.

It also updates the internal UpdateScale() client method to send extensions/v1beta1 Scale objects

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Nov 29, 2017
@openshift-ci-robot openshift-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 29, 2017
@openshift-merge-robot openshift-merge-robot added needs-api-review vendor-update Touching vendor dir or related files labels Nov 29, 2017
soltysh
soltysh reviewed Nov 30, 2017
View reviewed changes
pkg/apps/apiserver/apiserver.go
if apiGroupInfo.SubresourceGroupVersionKind == nil {
apiGroupInfo.SubresourceGroupVersionKind = map[string]schema.GroupVersionKind{}
}
apiGroupInfo.SubresourceGroupVersionKind["deploymentconfigs/scale"] = v1beta1extensions.SchemeGroupVersion.WithKind("Scale")
Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm... is it worth adding it here? The rebase (#17503) is going to remove SubresourceGroupVersionKind or are we not doing the rebase?

soltysh
soltysh approved these changes Nov 30, 2017
View reviewed changes
Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

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

The code changes lgtm, I have just one question.

@mfojtik
Copy link
Contributor

mfojtik commented Nov 30, 2017

/lgtm

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

mfojtik commented Nov 30, 2017

/retest

@liggitt liggitt added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 30, 2017
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 30, 2017
@liggitt
Copy link
Contributor Author

liggitt commented Nov 30, 2017

/retest

@openshift-merge-robot openshift-merge-robot removed the vendor-update Touching vendor dir or related files label Nov 30, 2017
@liggitt liggitt changed the title WIP - Fix deploymentconfig scale Fix deploymentconfig scale Nov 30, 2017
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 30, 2017
@liggitt
Copy link
Contributor Author

liggitt commented Nov 30, 2017

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 30, 2017
@liggitt liggitt added this to the 3.8.0 milestone Nov 30, 2017
@liggitt
Copy link
Contributor Author

liggitt commented Nov 30, 2017

/retest

1 similar comment
@liggitt
Copy link
Contributor Author

liggitt commented Dec 1, 2017

/retest

@soltysh
Copy link
Contributor

soltysh commented Dec 1, 2017

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 1, 2017
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, mfojtik, soltysh

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

@soltysh
Copy link
Contributor

soltysh commented Dec 1, 2017

/retest

@openshift-bot
Copy link
Contributor

/retest

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

3 similar comments
@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@openshift-bot
Copy link
Contributor

/retest

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

@liggitt
Copy link
Contributor Author

liggitt commented Dec 4, 2017

/retest

1 similar comment
@0xmichalis
Copy link
Contributor

/retest

@liggitt liggitt changed the base branch from master to release-3.8 December 4, 2017 23:56
@liggitt
Copy link
Contributor Author

liggitt commented Dec 4, 2017

/retest

@liggitt
Copy link
Contributor Author

liggitt commented Dec 5, 2017

opened 3.9 pull against master at #17587

@openshift-bot
Copy link
Contributor

/retest

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

@mfojtik
Copy link
Contributor

mfojtik commented Dec 5, 2017

/retest

@openshift-merge-robot
Copy link
Contributor

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

@soltysh
Copy link
Contributor

soltysh commented Dec 6, 2017

/retest

@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 6, 2017 •
edited
Loading

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

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_conformance_install_update 5ae38cf link /test extended_conformance_install_update

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.

@liggitt
Copy link
Contributor Author

liggitt commented Dec 6, 2017

/retest

@liggitt
Copy link
Contributor Author

liggitt commented Dec 6, 2017

extended_conformance_install has passed three times and failed four times with unrelated failures on this commit. this is blocking the 1.8.4 rebase... would like to green button it

@liggitt liggitt mentioned this pull request Dec 6, 2017
Closed
@deads2k
Copy link
Contributor

deads2k commented Dec 6, 2017

extended_conformance_install has passed three times and failed four times with unrelated failures on this commit. this is blocking the 1.8.4 rebase... would like to green button it

I better not turn purple this time...

@deads2k deads2k merged commit 65a963f into openshift:release-3.8 Dec 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@soltysh soltysh soltysh approved these changes

@mfojtik mfojtik Awaiting requested review from mfojtik

Assignees

@mfojtik mfojtik

@soltysh soltysh

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. needs-api-review size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v3.8
Development

Successfully merging this pull request may close these issues.
8 participants
@liggitt @mfojtik @soltysh @openshift-ci-robot @openshift-bot @0xmichalis @openshift-merge-robot @deads2k