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

1.8.4 rebase #17503

Closed
wants to merge 6 commits into from
Closed

1.8.4 rebase #17503

wants to merge 6 commits into from

Conversation

liggitt
Copy link
Contributor

@liggitt liggitt commented Nov 29, 2017 •
edited

Based on HEAD commit from openshift/kubernetes#47

No interesting origin changes

One upstream API change (ScaleIO PV secret namespace split)

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 29, 2017
@openshift-merge-robot openshift-merge-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. needs-api-review vendor-update Touching vendor dir or related files labels Nov 29, 2017
@liggitt liggitt added this to the 3.8.0 milestone Nov 29, 2017
@liggitt
Copy link
Contributor Author

liggitt commented Nov 29, 2017

cc @openshift/sig-master

@liggitt liggitt assigned mfojtik and deads2k and unassigned smarterclayton Nov 29, 2017
@liggitt
Copy link
Contributor Author

liggitt commented Nov 29, 2017

/test extended_builds
/test extended_image_ecosystem
/test extended_image_registry

mfojtik
mfojtik reviewed Nov 29, 2017
View reviewed changes
pkg/cmd/server/origin/openshift_apiserver.go
@@ -617,9 +616,8 @@ func apiLegacyV1(all map[string]rest.Storage) *genericapiserver.APIGroupInfo {
VersionedResourcesStorageMap: map[string]map[string]rest.Storage{},
Scheme: kapi.Scheme,
// version.ParameterCodec = runtime.NewParameterCodec(kapi.Scheme)
ParameterCodec: kapi.ParameterCodec,
NegotiatedSerializer: kapi.Codecs,
SubresourceGroupVersionKind: map[string]schema.GroupVersionKind{},
Copy link
Member

Choose a reason for hiding this comment

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

SubresourceGroupVersionKind for scale is not needed anymore?

Copy link
Member

Choose a reason for hiding this comment

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

seems like the test/cmd failing with error: no kind "Scale" is registered for version "extensions/v1beta1"

Copy link
Member

Choose a reason for hiding this comment

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

see https://github.com/liggitt/origin/pull/14

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I see the errors too. I don't think manual registration is the answer... trying to track down what changed

Copy link
Member

Choose a reason for hiding this comment

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

Part of the @mfojtik fix is coming from kubernetes/kubernetes#54744, so it needs to land. The expansions is something I personally dislike too :/.

Copy link
Member

Choose a reason for hiding this comment

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

I've tested and verified this approach works: https://github.com/liggitt/origin/pull/15

@mfojtik
Copy link
Member

mfojtik commented Nov 29, 2017 •
edited

@liggitt working on the Scale thing... seems troublesome: https://gist.github.com/soltysh/d3074edec8c7d67c6010acb33e6a295f

The client serializer prefer apps.openshift.io/v1 which is what is sent to server, but server wants extensionsv1beta1.Scale... Interestingly, when I removed extensions.Scale from apps scheme, it still used apps.Scale instead...

I passed the 'get' error with this patch: mfojtik@c882660

@soltysh tested what we sent to deploymentconfigs/../scale and:

in 3.6: we get extensions/v1beta1.Scale and send extensions/v1beta1.Scale
in 3.7: we get apps.openshift.io/v1.Scale and send apps.openshift.io/v1.Scale
in 3.8: we get extensions/v1beta1.Scale and send apps.openshift.io/v1.Scale

This was referenced Nov 29, 2017
Merged
Merged
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 6, 2017
@mfojtik
Copy link
Member

mfojtik commented Dec 6, 2017

@liggitt can you rebase this so we can land it?

@liggitt
Copy link
Contributor Author

liggitt commented Dec 6, 2017

waiting for #17520

@liggitt
Copy link
Contributor Author

liggitt commented Dec 6, 2017

and then need to re-move upstreams to openshift/kubernetes/release-1.8.1, rebase openshift/kubernetes/release-1.8.4, then I'll update this

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt

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

@liggitt liggitt changed the base branch from master to release-3.8 December 12, 2017 06:14
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 12, 2017
@liggitt
Copy link
Contributor Author

liggitt commented Dec 12, 2017

/retest

@liggitt
Copy link
Contributor Author

liggitt commented Dec 13, 2017

/retest
/test extended_image_registry
/test extended_image_ecosystem
/test extended_builds

@liggitt
Copy link
Contributor Author

liggitt commented Dec 13, 2017

/test extended_builds

@openshift-ci-robot
Copy link

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

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_conformance_install f71db0c link /test extended_conformance_install
ci/openshift-jenkins/extended_builds f71db0c link /test extended_builds

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.

@deads2k
Copy link
Contributor

deads2k commented Dec 15, 2017

lgtm. Tag once you get the deps fanned out.

@liggitt
Copy link
Contributor Author

liggitt commented Dec 18, 2017

1.8.5 was out. closing in favor of #17849

@liggitt liggitt closed this Dec 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mfojtik mfojtik mfojtik left review comments

@soltysh soltysh soltysh left review comments

Assignees

@mfojtik mfojtik

@sttts sttts

@deads2k deads2k

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. needs-api-review size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. vendor-update Touching vendor dir or related files
Projects
None yet
Milestone
v3.8
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@liggitt @mfojtik @openshift-ci-robot @deads2k @soltysh @sttts @smarterclayton @openshift-merge-robot