Merge pull request #67860 from m1kola/cleanup_logsForObject

pkg/kubectl/polymorphichelpers/logsforobject.go

@@ -29,7 +29,6 @@ import (
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/rest"
-	coreinternal "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/controller"
 )
 
@@ -55,17 +54,6 @@ func logsForObjectWithClient(clientset corev1client.CoreV1Interface, object, opt
 	}
 
 	switch t := object.(type) {
-	case *coreinternal.PodList:
-		ret := []*rest.Request{}
-		for i := range t.Items {
-			currRet, err := logsForObjectWithClient(clientset, &t.Items[i], options, timeout, allContainers)
-			if err != nil {
-				return nil, err
-			}
-			ret = append(ret, currRet...)
-		}
-		return ret, nil
-
 	case *corev1.PodList:
 		ret := []*rest.Request{}
 		for i := range t.Items {
@@ -77,34 +65,6 @@ func logsForObjectWithClient(clientset corev1client.CoreV1Interface, object, opt
 		}
 		return ret, nil
 
-	case *coreinternal.Pod:
-		// if allContainers is true, then we're going to locate all containers and then iterate through them. At that point, "allContainers" is false
-		if !allContainers {
-			return []*rest.Request{clientset.Pods(t.Namespace).GetLogs(t.Name, opts)}, nil
-		}
-
-		ret := []*rest.Request{}
-		for _, c := range t.Spec.InitContainers {
-			currOpts := opts.DeepCopy()
-			currOpts.Container = c.Name
-			currRet, err := logsForObjectWithClient(clientset, t, currOpts, timeout, false)
-			if err != nil {
-				return nil, err
-			}
-			ret = append(ret, currRet...)
-		}
-		for _, c := range t.Spec.Containers {
-			currOpts := opts.DeepCopy()
-			currOpts.Container = c.Name
-			currRet, err := logsForObjectWithClient(clientset, t, currOpts, timeout, false)
-			if err != nil {
-				return nil, err
-			}
-			ret = append(ret, currRet...)
-		}
-
-		return ret, nil
-
 	case *corev1.Pod:
 		// if allContainers is true, then we're going to locate all containers and then iterate through them. At that point, "allContainers" is false
 		if !allContainers {