print typed podlist for correct serialization

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

Author: juanvallejo

pkg/cmd/admin/node/listpods.go

@@ -1,6 +1,7 @@
 package node
 
 import (
+	"encoding/json"
 	"fmt"
 
 	"github.com/spf13/cobra"
@@ -11,6 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
 	kapi "k8s.io/kubernetes/pkg/api"
+	kapiv1 "k8s.io/kubernetes/pkg/api/v1"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	kprinters "k8s.io/kubernetes/pkg/printers"
 )
@@ -90,7 +92,12 @@ func (l *ListPodsOptions) runListPods(node *kapi.Node, printer kprinters.Resourc
 // objects for every node, into a single list. This allows output containing multiple nodes to be
 // printed to a single writer, and be easily parsed as a single data format.
 func (l *ListPodsOptions) handleRESTOutput(nodes []*kapi.Node, printer kprinters.ResourcePrinter) []error {
-	unifiedPodList := &kapi.PodList{}
+	unifiedPodList := &kapiv1.PodList{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "List",
+			APIVersion: "v1",
+		},
+	}
 
 	errList := []error{}
 	for _, node := range nodes {
@@ -107,7 +114,23 @@ func (l *ListPodsOptions) handleRESTOutput(nodes []*kapi.Node, printer kprinters
 			continue
 		}
 
-		unifiedPodList.Items = append(unifiedPodList.Items, pods.Items...)
+		unifiedPodList.ListMeta.SelfLink = pods.ListMeta.SelfLink
+
+		for _, pod := range pods.Items {
+			typedPod := &kapiv1.Pod{}
+			b, err := json.Marshal(pod)
+			if err != nil {
+				errList = append(errList, err)
+				continue
+			}
+			err = json.Unmarshal(b, typedPod)
+			if err != nil {
+				errList = append(errList, err)
+				continue
+			}
+
+			unifiedPodList.Items = append(unifiedPodList.Items, *typedPod)
+		}
 	}
 
 	printer.PrintObj(unifiedPodList, l.Options.Writer)

test/cmd/admin.sh

@@ -78,6 +78,8 @@ os::cmd::expect_success_and_not_text 'oadm manage-node --selector= --schedulable
 os::cmd::expect_success_and_not_text 'oc get node -o yaml' 'unschedulable: true'
 os::cmd::expect_success_and_text 'oadm manage-node --selector= --schedulable=false' 'SchedulingDisabled'
 os::cmd::expect_success_and_text 'oc get node -o yaml' 'unschedulable: true'
+# ensure correct serialization of podList output
+os::cmd::expect_success_and_text "oadm manage-node --list-pods --selector= -o jsonpath='{ .kind }'" 'List'
 echo "manage-node: ok"
 os::test::junit::declare_suite_end