use external client

Author: juanvallejo

pkg/cmd/admin/node/listpods.go

@@ -14,7 +14,6 @@ import (
 	kapiv1 "k8s.io/kubernetes/pkg/api/v1"
 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	kprinters "k8s.io/kubernetes/pkg/printers"
-	"k8s.io/kubernetes/staging/src/k8s.io/client-go/kubernetes/scheme"
 )
 
 type ListPodsOptions struct {
@@ -108,23 +107,13 @@ func (l *ListPodsOptions) handleRESTOutput(nodes []*kapi.Node, printer kprinters
 		}
 		fieldSelector := fields.Set{GetPodHostFieldLabel(node.TypeMeta.APIVersion): node.ObjectMeta.Name}.AsSelector()
 
-		pods := &kapiv1.PodList{}
-
-		restClient := l.Options.KubeClient.Core().RESTClient()
-		err = restClient.Get().
-			Namespace(metav1.NamespaceAll).
-			Resource("pods").
-			VersionedParams(&metav1.ListOptions{LabelSelector: labelSelector.String(), FieldSelector: fieldSelector.String()}, scheme.ParameterCodec).
-			Do().
-			Into(pods)
+		pods, err := l.Options.ExternalKubeClient.CoreV1().Pods(metav1.NamespaceAll).List(metav1.ListOptions{LabelSelector: labelSelector.String(), FieldSelector: fieldSelector.String()})
 		if err != nil {
 			errList = append(errList, err)
 			continue
 		}
 
-		for _, pod := range pods.Items {
-			unifiedPodList.Items = append(unifiedPodList.Items, pod)
-		}
+		unifiedPodList.Items = append(unifiedPodList.Items, pods.Items...)
 	}
 
 	printer.PrintObj(unifiedPodList, l.Options.Writer)

pkg/cmd/admin/node/node_options.go

@@ -16,18 +16,20 @@ import (
 	kerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
 	kapi "k8s.io/kubernetes/pkg/api"
-	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
+	kclientset "k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
+	internalclientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
 	kprinters "k8s.io/kubernetes/pkg/printers"
 
 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"
 )
 
 type NodeOptions struct {
-	DefaultNamespace string
-	KubeClient       kclientset.Interface
-	Writer           io.Writer
-	ErrWriter        io.Writer
+	DefaultNamespace   string
+	ExternalKubeClient kclientset.Interface
+	KubeClient         internalclientset.Interface
+	Writer             io.Writer
+	ErrWriter          io.Writer
 
 	Mapper            meta.RESTMapper
 	Typer             runtime.ObjectTyper
@@ -50,17 +52,29 @@ func (n *NodeOptions) Complete(f *clientcmd.Factory, c *cobra.Command, args []st
 	if err != nil {
 		return err
 	}
+
 	_, kc, err := f.Clients()
 	if err != nil {
 		return err
 	}
+
+	config, err := f.ClientConfig()
+	if err != nil {
+		return err
+	}
+	externalkc, err := kclientset.NewForConfig(config)
+	if err != nil {
+		return err
+	}
+
 	cmdPrinter, err := f.PrinterForCommand(c, false, nil, kprinters.PrintOptions{})
 	if err != nil {
 		return err
 	}
 	mapper, typer := f.Object()
 
 	n.DefaultNamespace = defaultNamespace
+	n.ExternalKubeClient = externalkc
 	n.KubeClient = kc
 	n.Writer = out
 	n.ErrWriter = errout