From eb27e1c471c582aa92089b0dbea8d09d03f5da96 Mon Sep 17 00:00:00 2001 From: xiangpengzhao Date: Sat, 4 Nov 2017 00:03:34 +0800 Subject: [PATCH] Remove version check for kubectl portfoward. --- test/e2e/kubectl/portforward.go | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/test/e2e/kubectl/portforward.go b/test/e2e/kubectl/portforward.go index 167126f55ea..3d87d7ed250 100644 --- a/test/e2e/kubectl/portforward.go +++ b/test/e2e/kubectl/portforward.go @@ -22,7 +22,6 @@ import ( "bytes" "encoding/binary" "fmt" - "io" "io/ioutil" "net" "os/exec" @@ -36,7 +35,6 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" - utilversion "k8s.io/kubernetes/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" testutils "k8s.io/kubernetes/test/utils" imageutils "k8s.io/kubernetes/test/utils/image" @@ -51,8 +49,7 @@ const ( // TODO support other ports besides 80 var ( - portForwardRegexp = regexp.MustCompile("Forwarding from 127.0.0.1:([0-9]+) -> 80") - portForwardPortToStdOutV = utilversion.MustParseSemantic("v1.3.0-alpha.4") + portForwardRegexp = regexp.MustCompile("Forwarding from 127.0.0.1:([0-9]+) -> 80") ) func pfPod(expectedClientData, chunks, chunkSize, chunkIntervalMillis string, bindAddress string) *v1.Pod { @@ -167,25 +164,13 @@ func runPortForward(ns, podName string, port int) *portForwardCommand { // by the port-forward command. We don't want to hard code the port as we have no // way of guaranteeing we can pick one that isn't in use, particularly on Jenkins. framework.Logf("starting port-forward command and streaming output") - stdout, stderr, err := framework.StartCmdAndStreamOutput(cmd) + portOutput, _, err := framework.StartCmdAndStreamOutput(cmd) if err != nil { framework.Failf("Failed to start port-forward command: %v", err) } buf := make([]byte, 128) - // After v1.3.0-alpha.4 (#17030), kubectl port-forward outputs port - // info to stdout, not stderr, so for version-skewed tests, look there - // instead. - var portOutput io.ReadCloser - if useStdOut, err := framework.KubectlVersionGTE(portForwardPortToStdOutV); err != nil { - framework.Failf("Failed to get kubectl version: %v", err) - } else if useStdOut { - portOutput = stdout - } else { - portOutput = stderr - } - var n int framework.Logf("reading from `kubectl port-forward` command's stdout") if n, err = portOutput.Read(buf); err != nil {