Experiment: Replace NewSPDYExecutor (#1217)

Author: sebrandon1

tests/globalhelper/pod.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"os"
 	"strings"
 	"time"
 
@@ -13,44 +12,25 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/kubernetes/scheme"
 	typedcorev1 "k8s.io/client-go/kubernetes/typed/core/v1"
-	"k8s.io/client-go/tools/remotecommand"
 	klog "k8s.io/klog/v2"
+
+	egiPod "github.com/openshift-kni/eco-goinfra/pkg/pod"
 )
 
 // ExecCommand runs command in the pod and returns buffer output.
 func ExecCommand(pod corev1.Pod, command []string) (bytes.Buffer, error) {
 	var buf bytes.Buffer
 
-	req := GetAPIClient().CoreV1Interface.RESTClient().
-		Post().
-		Namespace(pod.Namespace).
-		Resource("pods").
-		Name(pod.Name).
-		SubResource("exec").
-		VersionedParams(&corev1.PodExecOptions{
-			Container: pod.Spec.Containers[0].Name,
-			Command:   command,
-			Stdin:     true,
-			Stdout:    true,
-			Stderr:    true,
-			TTY:       true,
-		}, scheme.ParameterCodec)
-
-	exec, err := remotecommand.NewSPDYExecutor(GetAPIClient().Config, "POST", req.URL())
+	builder, err := egiPod.Pull(GetEcoGoinfraClient(), pod.Name, pod.Namespace)
 	if err != nil {
 		return buf, err
 	}
 
-	err = exec.StreamWithContext(context.TODO(), remotecommand.StreamOptions{
-		Stdin:  os.Stdin,
-		Stdout: &buf,
-		Stderr: os.Stderr,
-		Tty:    true,
-	})
+	// Exec in the first container by default (matches previous behavior)
+	buf, err = builder.ExecCommand(command)
 	if err != nil {
-		return buf, err
+		return bytes.Buffer{}, err
 	}
 
 	return buf, nil

tests/performance/helper/helper.go

@@ -8,8 +8,6 @@ import (
 
 	"github.com/redhat-best-practices-for-k8s/certsuite-qe/tests/globalhelper"
 	"github.com/redhat-best-practices-for-k8s/certsuite-qe/tests/utils/pod"
-	"k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/tools/remotecommand"
 	klog "k8s.io/klog/v2"
 	"k8s.io/utils/ptr"
 
@@ -20,6 +18,8 @@ import (
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	egiPod "github.com/openshift-kni/eco-goinfra/pkg/pod"
 )
 
 func DefineExclusivePod(podName string, namespace string, image string, label map[string]string) *corev1.Pod {
@@ -140,46 +140,26 @@ func ExecCommandContainer(
 
 	var buffOut bytes.Buffer
 
-	var buffErr bytes.Buffer
-
 	podName := pod.Name
 	podNamespace := pod.Namespace
-	container := pod.Spec.Containers[0].Name
 
+	containerName := pod.Spec.Containers[0].Name
 	klog.V(5).Infof("execute command on ns=%s, pod=%s container=%s, cmd: %s",
-		podNamespace, podName, container, strings.Join(commandStr, " "))
-
-	req := globalhelper.GetAPIClient().CoreV1Interface.RESTClient().
-		Post().
-		Namespace(podNamespace).
-		Resource("pods").
-		Name(podName).
-		SubResource("exec").
-		VersionedParams(&corev1.PodExecOptions{
-			Container: container,
-			Command:   commandStr,
-			Stdin:     false,
-			Stdout:    true,
-			Stderr:    true,
-			TTY:       false,
-		}, scheme.ParameterCodec)
-
-	exec, err := remotecommand.NewSPDYExecutor(globalhelper.GetAPIClient().Config, "POST", req.URL())
+		podNamespace, podName, containerName, strings.Join(commandStr, " "))
+
+	builder, err := egiPod.Pull(globalhelper.GetEcoGoinfraClient(), podName, podNamespace)
 	if err != nil {
 		klog.ErrorS(err, "failed to create SPDY executor")
 
-		return stdout, stderr, err
+		return "", "", err
 	}
 
-	err = exec.StreamWithContext(context.TODO(), remotecommand.StreamOptions{
-		Stdout: &buffOut,
-		Stderr: &buffErr,
-	})
-
-	stdout, stderr = buffOut.String(), buffErr.String()
+	buffOut, err = builder.ExecCommand(commandStr)
+	stdout = buffOut.String()
+	// stderr is not captured by eco-goinfra ExecCommand; leave empty
 
 	if err != nil {
-		klog.ErrorS(err, "exec stream failed", "url", req.URL(), "command", command, "stderr", stderr, "stdout", stdout)
+		klog.ErrorS(err, "exec stream failed", "command", command, "stderr", stderr, "stdout", stdout)
 
 		return stdout, stderr, err
 	}