Fix random port usage and add retry handling

Signed-off-by: Reinhard Nägele <[email protected]>

Gopkg.toml

@@ -30,3 +30,7 @@
 [[constraint]]
     name = "gopkg.in/yaml.v2"
     version = "v2.2.1"
+
+[[constraint]]
+    name = "github.com/hashicorp/go-retryablehttp"
+    version = "v0.5.2"

pkg/exec/exec.go

@@ -17,15 +17,12 @@ package exec
 import (
 	"bufio"
 	"fmt"
+	"github.com/helm/chart-testing/pkg/util"
+	"github.com/pkg/errors"
 	"io"
-	"net"
 	"os"
 	"os/exec"
 	"strings"
-	"sync"
-
-	"github.com/helm/chart-testing/pkg/util"
-	"github.com/pkg/errors"
 )
 
 type ProcessExecutor struct {
@@ -109,34 +106,27 @@ func (p ProcessExecutor) CreateProcess(executable string, execArgs ...interface{
 type fn func(port int) error
 
 func (p ProcessExecutor) RunWithProxy(withProxy fn) error {
-	listener, err := net.Listen("tcp", ":0")
-	defer listener.Close()
+	randomPort, err := util.GetRandomPort()
 	if err != nil {
-		return errors.Wrap(err, "Could not find a free port to run 'kubectl proxy'")
+		return errors.Wrap(err, "Could not find a free port for running 'kubectl proxy'")
 	}
 
-	randomPort := listener.Addr().(*net.TCPAddr).Port
-	fmt.Printf("Running ' kubectl proxy on port %d\n", randomPort)
-	cmdProxy, err := p.CreateProcess("kubectl", "proxy", "--port", randomPort)
+	fmt.Printf("Running 'kubectl proxy' on port %d\n", randomPort)
+	cmdProxy, err := p.CreateProcess("kubectl", "proxy", fmt.Sprintf("--port=%d", randomPort))
 	if err != nil {
 		return errors.Wrap(err, "Error creating the 'kubectl proxy' process")
 	}
-
-	var wg sync.WaitGroup
-	wg.Add(1)
+	err = cmdProxy.Start()
+	if err != nil {
+		return errors.Wrap(err, "Error starting the 'kubectl proxy' process")
+	}
 
 	go func() {
-		err = cmdProxy.Start()
-		if err != nil {
-			fmt.Println("Error starting the 'kubectl proxy' process:", err)
-			return
-		}
-		wg.Wait()
+		cmdProxy.Wait()
 	}()
 
 	err = withProxy(randomPort)
 
-	wg.Done()
 	cmdProxy.Process.Signal(os.Kill)
 
 	if err != nil {

pkg/tool/kubectl.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/hashicorp/go-retryablehttp"
 	"github.com/helm/chart-testing/pkg/exec"
 	"github.com/pkg/errors"
 )
@@ -90,15 +91,17 @@ func (k Kubectl) forceNamespaceDeletion(namespace string) error {
 	// Remove finalizer from the namespace
 	fun := func(port int) error {
 		k8sURL := fmt.Sprintf("http://127.0.0.1:%d/api/v1/namespaces/%s/finalize", port, namespace)
-		req, err := http.NewRequest("PUT", k8sURL, bytes.NewReader(namespaceUpdateBytes))
+		req, err := retryablehttp.NewRequest("PUT", k8sURL, bytes.NewReader(namespaceUpdateBytes))
 		if err != nil {
 			fmt.Println("Error creating the request to update the namespace:", err)
 			return err
 		}
 		req.Header.Set("Content-Type", "application/json")
 
 		errMsg := "Error removing finalizer from namespace"
-		if resp, err := http.DefaultClient.Do(req); err != nil {
+		client := retryablehttp.NewClient()
+		client.Logger = nil
+		if resp, err := client.Do(req); err != nil {
 			return errors.Wrap(err, errMsg)
 		} else if resp.StatusCode != http.StatusOK {
 			return errors.New(errMsg)

pkg/util/util.go

@@ -21,6 +21,7 @@ import (
 	"gopkg.in/yaml.v2"
 	"io/ioutil"
 	"math/rand"
+	"net"
 	"os"
 	"path"
 	"path/filepath"
@@ -203,3 +204,13 @@ func TruncateLeft(s string, maxLength int) string {
 	}
 	return s
 }
+
+func GetRandomPort() (int , error) {
+	listener, err := net.Listen("tcp", ":0")
+	defer listener.Close()
+	if err != nil {
+		return 0, err
+	}
+
+	return listener.Addr().(*net.TCPAddr).Port, nil
+}