fix newapp resource convert for extensions and apps groups #15787

juanvallejo · 2017-08-15T23:46:32Z

Before

$ oc new-app -f examples/prometheus/prometheus.yaml -o yaml
error: extensions.Deployment is not suitable for converting to ""

After

$ oc new-app -f examples/prometheus/prometheus.yaml -o yaml | head
apiVersion: v1
items:
- apiVersion: v1
  kind: ServiceAccount
  metadata:
    annotations:
      openshift.io/generated-by: OpenShiftNewApp
      serviceaccounts.openshift.io/oauth-redirectreference.primary: '{"kind":"OAuthRedirectReference","apiVersion":"v1","reference":{"kind":"Route","name":"prometheus"}}'
    creationTimestamp: null
    name: prometheus

cc @fabianofranz @smarterclayton

smarterclayton · 2017-08-16T05:04:43Z

pkg/cmd/util/cmd.go

+		// if no preferred version found in the list of given GroupVersions,
+		// attempt to convert to first GroupVersion that satisfies a preferred version
+		if len(actualOutputVersion.Version) == 0 {
+			for _, version := range preferredVersions {


You shouldn't even need to do this loop - you should be passing preferredVersions in to ConvertToVersion as a Versioner.

smarterclayton · 2017-08-16T05:05:31Z

pkg/cmd/util/cmd.go

+		// the given object is guaranteed to be at least part of one group by this point.
+		if len(preferredVersions) == 0 {
+			defaultGroupVersion := groups[0].GroupVersion
+			convertedObject, err := kapi.Scheme.ConvertToVersion(obj, defaultGroupVersion)


You should just be passing in groupVersions to ConvertToVersion (you'll need to cast to the runtime schema type which handles Versioner).

smarterclayton · 2017-08-16T05:05:38Z

Tests.

juanvallejo · 2017-08-17T15:29:21Z

/test extended_templates
/test extended_conformance_gce

juanvallejo · 2017-08-17T17:50:57Z

/test extended_conformance_gce

juanvallejo · 2017-08-17T19:38:27Z

@smarterclayton thanks for the feedback, review comments addressed

fabianofranz · 2017-08-18T18:33:38Z

test/cmd/newapp.sh

+os::cmd::expect_success_and_text 'oc new-app -f examples/prometheus/prometheus.yaml -o yaml' 'apiVersion: apps/v1beta1'
+# check that if an --output-version is requested on a list of varying resource kinds, an error is returned if
+# at least one of the resource groups does not support the given version
+os::cmd::expect_failure_and_text 'oc new-app -f examples/prometheus/prometheus.yaml -o yaml --output-version=v1' 'extensions.Deployment is not suitable for converting'


Minor comment, make it more defensive against future changes by just checking "not suitable for converting".

fabianofranz · 2017-08-18T19:22:14Z

/lgtm
/approve

juanvallejo · 2017-08-18T20:35:37Z

@fabianofranz

Minor comment, make it more defensive against future changes by just checking "not suitable for converting".

Since examples/prometheus/prometheus.yaml contains multiple resources of different group versions, any time I test the --output-version flag I will get at least one resource that is incompatible with the user-supplied version (e.g. --output-version=extensions/v1beta1 would not be compatible with api.Secret). I have gone ahead and created a new test file that only deals with two specific resources (api.Secret, and extensions.Deployment) in order to check for the specific resource in the tests.

juanvallejo · 2017-08-18T22:12:05Z

/test unit

fabianofranz · 2017-08-21T14:50:45Z

/lgtm
/approve

smarterclayton · 2017-08-23T02:12:47Z

/approve

…

On Mon, Aug 21, 2017 at 10:51 AM, OpenShift Merge Robot < ***@***.***> wrote: [APPROVALNOTIFIER] This PR is *NOT APPROVED* This pull-request has been approved by: *fabianofranz <#15787 (comment)>*, *juanvallejo <#15787#>* We suggest the following additional approver: *smarterclayton* Assign the PR to them by writing /assign @smarterclayton in a comment when ready. The full list of commands accepted by this bot can be found here <https://github.com/kubernetes/test-infra/blob/master/commands.md>. Needs approval from an approver in each of these OWNERS Files: - pkg/cmd/OWNERS <https://github.com/openshift/origin/blob/master/pkg/cmd/OWNERS> [fabianofranz] - test/cmd/OWNERS <https://github.com/openshift/origin/blob/master/test/cmd/OWNERS> [fabianofranz] - *test/testdata/OWNERS <https://github.com/openshift/origin/blob/master/test/testdata/OWNERS>* You can indicate your approval by writing /approve in a comment You can cancel your approval by writing /approve cancel in a comment — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#15787 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABG_p6IXoUQSeMiOYeCZVA0-thF1ate3ks5saZlggaJpZM4O4PuT> .

openshift-merge-robot · 2017-08-23T02:12:54Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabianofranz, juanvallejo, smarterclayton

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

~~pkg/cmd/OWNERS~~ [fabianofranz,smarterclayton]
~~test/cmd/OWNERS~~ [fabianofranz,smarterclayton]
~~test/testdata/OWNERS~~ [smarterclayton]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

openshift-merge-robot · 2017-08-23T04:33:07Z

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

openshift-merge-robot · 2017-08-23T06:30:24Z

Automatic merge from submit-queue

openshift-merge-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 15, 2017

openshift-merge-robot assigned smarterclayton and fabianofranz Aug 15, 2017

smarterclayton reviewed Aug 16, 2017

View reviewed changes

openshift-merge-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Aug 16, 2017

juanvallejo requested a review from fabianofranz August 17, 2017 22:10

fabianofranz reviewed Aug 18, 2017

View reviewed changes

juanvallejo force-pushed the jvallejo/update-cmdutil-resource-convert branch from 338aad1 to b9be10f Compare August 18, 2017 19:08

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 18, 2017

openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 18, 2017

juanvallejo force-pushed the jvallejo/update-cmdutil-resource-convert branch from b9be10f to 385da29 Compare August 18, 2017 20:29

fix newapp resource convert for extensions and apps groups

e043fb2

juanvallejo force-pushed the jvallejo/update-cmdutil-resource-convert branch from 385da29 to 2f39e7f Compare August 18, 2017 20:29

add tests

d065082

juanvallejo force-pushed the jvallejo/update-cmdutil-resource-convert branch from 2f39e7f to d065082 Compare August 18, 2017 20:31

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Aug 21, 2017

openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 23, 2017

openshift-merge-robot merged commit c1e9505 into openshift:master Aug 23, 2017

juanvallejo deleted the jvallejo/update-cmdutil-resource-convert branch August 23, 2017 13:50

fix newapp resource convert for extensions and apps groups #15787

fix newapp resource convert for extensions and apps groups #15787

Uh oh!

Conversation

juanvallejo commented Aug 15, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

smarterclayton Aug 16, 2017

Choose a reason for hiding this comment

Uh oh!

smarterclayton Aug 16, 2017

Choose a reason for hiding this comment

Uh oh!

smarterclayton commented Aug 16, 2017

Uh oh!

juanvallejo commented Aug 17, 2017

Uh oh!

juanvallejo commented Aug 17, 2017

Uh oh!

juanvallejo commented Aug 17, 2017

Uh oh!

fabianofranz Aug 18, 2017

Choose a reason for hiding this comment

Uh oh!

juanvallejo Aug 18, 2017

Choose a reason for hiding this comment

Uh oh!

fabianofranz commented Aug 18, 2017

Uh oh!

juanvallejo commented Aug 18, 2017

Uh oh!

juanvallejo commented Aug 18, 2017

Uh oh!

fabianofranz commented Aug 21, 2017

Uh oh!

smarterclayton commented Aug 23, 2017 via email

Uh oh!

openshift-merge-robot commented Aug 23, 2017

Uh oh!

openshift-merge-robot commented Aug 23, 2017

Uh oh!

openshift-merge-robot commented Aug 23, 2017

Uh oh!

Uh oh!

juanvallejo commented Aug 15, 2017 •

edited

Loading