print typed podlist for correct serialization by juanvallejo · Pull Request #15411 · openshift/origin

juanvallejo · 2017-07-21T19:02:39Z

BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1473455

Pass a typed list of pods to the printer in order to have correctly
serialized output.

Before

$ oadm manage-node --list-pods localhost -o yaml | head -n 20

Items:
- Spec:
    ActiveDeadlineSeconds: null
    Affinity: null
    AutomountServiceAccountToken: null
    Containers:
    - Args: null
      Command: null
      Env:
      - Name: REGISTRY_HTTP_ADDR
        Value: :5000
        ValueFrom: null
      - Name: REGISTRY_HTTP_NET
        Value: tcp
        ValueFrom: null
      - Name: REGISTRY_HTTP_SECRET
        Value: oQg1bMYH9dGM4S7D4p4W6eXG+wA91syQdJMIjB0v52A=
        ValueFrom: null
      - Name: REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_ENFORCEQUOTA
...

After

$ oadm manage-node --list-pods localhost -o yaml | head -n 20

apiVersion: v1
items:
- metadata:
    creationTimestamp: null
  spec:
    containers:
    - env:
      - name: REGISTRY_HTTP_ADDR
        value: :5000
      - name: REGISTRY_HTTP_NET
        value: tcp
      - name: REGISTRY_HTTP_SECRET
        value: oQg1bMYH9dGM4S7D4p4W6eXG+wA91syQdJMIjB0v52A=
      - name: REGISTRY_MIDDLEWARE_REPOSITORY_OPENSHIFT_ENFORCEQUOTA
        value: "false"
      image: openshift/origin-docker-registry:v3.6.0-alpha.2
      imagePullPolicy: IfNotPresent
      livenessProbe:
        failureThreshold: 3
        httpGet:
...

cc @openshift/cli-review @smarterclayton

juanvallejo · 2017-07-21T19:03:48Z

pkg/cmd/admin/node/listpods.go

+				errList = append(errList, err)
+				continue
+			}
+			err = json.Unmarshal(b, typedPod)


@fabianofranz not sure if we have a more streamlined way of converting from internal to external type?

@deads2k would you suggest something different here?

kapi.Scheme.Convert

Why not just do a Get with the "right" type of client" a few lines up?

juanvallejo · 2017-07-21T19:04:40Z

[test]

fabianofranz · 2017-07-21T21:07:58Z

@juanvallejo thanks! Could you add a test to avoid future regressions? test/cmd/admin.sh works for me.

fabianofranz · 2017-07-21T21:09:16Z

re[test]

juanvallejo · 2017-07-24T18:39:19Z

@deads2k switched to using restclient and making "get" call directly, ptal

deads2k · 2017-07-24T18:43:14Z

pkg/cmd/admin/node/listpods.go

-		pods, err := l.Options.KubeClient.Core().Pods(metav1.NamespaceAll).List(metav1.ListOptions{LabelSelector: labelSelector.String(), FieldSelector: fieldSelector.String()})
+		pods := &kapiv1.PodList{}
+
+		restClient := l.Options.KubeClient.Core().RESTClient()


I was thinking more like, why don't you have an external client ado the .List() on that.

juanvallejo · 2017-07-24T21:47:26Z

@deads2k thanks for the feedback; switched to using external client

smarterclayton · 2017-07-24T22:07:16Z

This has to be back ported to 3.6 - are also of these changes necessary for that?

…

On Mon, Jul 24, 2017 at 5:47 PM, Juan Vallejo ***@***.***> wrote: @deads2k <https://github.com/deads2k> thanks for the feedback; switched to using external client — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#15411 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ABG_p3wCKYpqFdMp02PfjjEL7m7uRUjwks5sRRDwgaJpZM4Ofxs6> .

openshift-bot · 2017-07-25T00:08:55Z

Evaluated for origin test up to 79c27e1

openshift-bot · 2017-07-25T00:09:02Z

continuous-integration/openshift-jenkins/test Running (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/3465/) (Base Commit: 49df2d6) (PR Branch Commit: 79c27e1)

openshift-bot · 2017-07-25T02:41:38Z

continuous-integration/openshift-jenkins/test SUCCESS

deads2k · 2017-07-25T12:14:46Z

This has to be back ported to 3.6 - are also of these changes necessary for
that?

@smarterclayton Didn't break in the recent rebase? This change is more correct than the previous one and 30 lines isn't too bad.

deads2k · 2017-07-26T13:01:40Z

lgtm, squash

/retest
/approve no-issue

deads2k · 2017-07-26T13:01:56Z

/test all

deads2k · 2017-07-26T13:04:58Z

/assign fabianofranz
/unassign

fabianofranz · 2017-07-26T15:13:11Z

/lgtm

juanvallejo · 2017-07-26T16:40:16Z

extended_conformance_gce flaked on #13973

/test extended_conformance_gce

Pass a typed list of pods to the printer in order to have correctly serialized output.

fabianofranz · 2017-07-27T15:33:06Z

/lgtm

openshift-merge-robot · 2017-07-27T15:33:18Z

[APPROVALNOTIFIER] This PR is APPROVED

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

Associated issue requirement bypassed by: deads2k

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

Details

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

~~pkg/oc/OWNERS~~ [deads2k,fabianofranz]
~~test/cmd/OWNERS~~ [deads2k]

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

juanvallejo · 2017-07-27T17:19:21Z

/test extended_conformance_gce
/test extended_conformance_install_update

openshift-merge-robot · 2017-07-27T22:10:46Z

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

openshift-ci-robot · 2017-07-28T00:26:06Z

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

Test name	Commit	Details	Rerun command
ci/openshift-jenkins/integration	`62baba1`	link	`/test integration`
ci/openshift-jenkins/extended_conformance_install_update	`62baba1`	link	`/test extended_conformance_install_update`

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

Details

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.

openshift-merge-robot · 2017-07-28T01:59:28Z

Automatic merge from submit-queue (batch tested with PRs 15447, 15411, 15483, 15478, 15481)

juanvallejo commented Jul 21, 2017

View reviewed changes

juanvallejo force-pushed the jvallejo/print-typed-podlist-oadm-manage-node branch from f0d52c1 to c100b12 Compare July 21, 2017 21:53

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

deads2k reviewed Jul 24, 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 Jul 24, 2017

juanvallejo force-pushed the jvallejo/print-typed-podlist-oadm-manage-node branch 2 times, most recently from 86349db to 79c27e1 Compare July 24, 2017 21:52

openshift-merge-robot assigned liggitt and smarterclayton Jul 25, 2017

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

openshift-ci-robot assigned fabianofranz Jul 26, 2017

juanvallejo force-pushed the jvallejo/print-typed-podlist-oadm-manage-node branch from 79c27e1 to baf9b6e Compare July 26, 2017 13:53

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

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 27, 2017

print typed podlist for correct serialization

62baba1

Pass a typed list of pods to the printer in order to have correctly serialized output.

juanvallejo force-pushed the jvallejo/print-typed-podlist-oadm-manage-node branch from baf9b6e to 62baba1 Compare July 27, 2017 15:02

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 Jul 27, 2017

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

juanvallejo mentioned this pull request Jul 27, 2017

print typed podlist for correct serialization #15519

Merged

openshift-merge-robot merged commit 803bc25 into openshift:master Jul 28, 2017

juanvallejo deleted the jvallejo/print-typed-podlist-oadm-manage-node branch August 1, 2017 15:10

Conversation

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

Uh oh!

Uh oh!

juanvallejo Jul 21, 2017

Choose a reason for hiding this comment

Uh oh!

fabianofranz Jul 21, 2017

Choose a reason for hiding this comment

Uh oh!

deads2k Jul 24, 2017

Choose a reason for hiding this comment

Uh oh!

deads2k Jul 24, 2017

Choose a reason for hiding this comment

Uh oh!

juanvallejo commented Jul 21, 2017

Uh oh!

fabianofranz commented Jul 21, 2017

Uh oh!

fabianofranz commented Jul 21, 2017

Uh oh!

juanvallejo commented Jul 24, 2017

Uh oh!

deads2k Jul 24, 2017

Choose a reason for hiding this comment

Uh oh!

juanvallejo commented Jul 24, 2017

Uh oh!

smarterclayton commented Jul 24, 2017 via email

Uh oh!

openshift-bot commented Jul 25, 2017

Uh oh!

openshift-bot commented Jul 25, 2017

Uh oh!

openshift-bot commented Jul 25, 2017

Uh oh!

deads2k commented Jul 25, 2017

Uh oh!

deads2k commented Jul 26, 2017

Uh oh!

deads2k commented Jul 26, 2017

Uh oh!

deads2k commented Jul 26, 2017

Uh oh!

fabianofranz commented Jul 26, 2017

Uh oh!

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

Uh oh!

Uh oh!

fabianofranz commented Jul 27, 2017

Uh oh!

openshift-merge-robot commented Jul 27, 2017

Uh oh!

juanvallejo commented Jul 27, 2017

Uh oh!

openshift-merge-robot commented Jul 27, 2017

Uh oh!

openshift-ci-robot commented Jul 28, 2017

Uh oh!

openshift-merge-robot commented Jul 28, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

juanvallejo commented Jul 21, 2017 •

edited

Loading

juanvallejo commented Jul 26, 2017 •

edited

Loading