UPSTREAM: <drop>: improved metrics test output to troubleshoot failure

Signed-off-by: Joe Lanford <[email protected]>

Author: joelanford

test/e2e/metrics_test.go

@@ -2,7 +2,9 @@ package e2e
 
 import (
 	"bytes"
+	"io"
 	"os/exec"
+	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -20,11 +22,10 @@ import (
 // 6. Cleans up all resources created during the test, such as the ClusterRoleBinding and curl pod.
 func TestOperatorControllerMetricsExportedEndpoint(t *testing.T) {
 	var (
-		token     string
-		curlPod   = "curl-metrics"
-		namespace = "olmv1-system"
-		client    = ""
-		clients   = []string{"kubectl", "oc"}
+		token   string
+		curlPod = "curl-metrics"
+		client  = ""
+		clients = []string{"kubectl", "oc"}
 	)
 
 	t.Log("Looking for k8s client")
@@ -41,11 +42,17 @@ func TestOperatorControllerMetricsExportedEndpoint(t *testing.T) {
 	}
 	t.Logf("Using %q as k8s client", client)
 
+	t.Log("Determining operator-controller namespace")
+	cmd := exec.Command(client, "get", "pods", "--all-namespaces", "--selector=control-plane=operator-controller-controller-manager", "--output=jsonpath={.metadata.namespace}")
+	output, err := cmd.CombinedOutput()
+	require.NoError(t, err, "Error creating determining operator-controller namespace: %s", string(output))
+	namespace := strings.Split(string(output), "\n")[0]
+
 	t.Log("Creating ClusterRoleBinding for operator controller metrics")
-	cmd := exec.Command(client, "create", "clusterrolebinding", "operator-controller-metrics-binding",
+	cmd = exec.Command(client, "create", "clusterrolebinding", "operator-controller-metrics-binding",
 		"--clusterrole=operator-controller-metrics-reader",
 		"--serviceaccount="+namespace+":operator-controller-controller-manager")
-	output, err := cmd.CombinedOutput()
+	output, err = cmd.CombinedOutput()
 	require.NoError(t, err, "Error creating ClusterRoleBinding: %s", string(output))
 
 	defer func() {
@@ -55,8 +62,8 @@ func TestOperatorControllerMetricsExportedEndpoint(t *testing.T) {
 
 	t.Log("Generating ServiceAccount token")
 	tokenCmd := exec.Command(client, "create", "token", "operator-controller-controller-manager", "-n", namespace)
-	tokenOutput, err := tokenCmd.Output()
-	require.NoError(t, err, "Error creating token: %s", string(tokenOutput))
+	tokenOutput, tokenCombinedOutput, err := stdoutAndCombined(tokenCmd)
+	require.NoError(t, err, "Error creating token: %s", string(tokenCombinedOutput))
 	token = string(bytes.TrimSpace(tokenOutput))
 
 	t.Log("Creating curl pod to validate the metrics endpoint")
@@ -105,3 +112,13 @@ func TestOperatorControllerMetricsExportedEndpoint(t *testing.T) {
 	require.NoError(t, err, "Error calling metrics endpoint: %s", string(output))
 	require.Contains(t, string(output), "200 OK", "Metrics endpoint did not return 200 OK")
 }
+
+func stdoutAndCombined(cmd *exec.Cmd) ([]byte, []byte, error) {
+	var outOnly bytes.Buffer
+	var outAndErr bytes.Buffer
+	allWriter := io.MultiWriter(&outOnly, &outAndErr)
+	cmd.Stderr = &outAndErr
+	cmd.Stdout = allWriter
+	err := cmd.Run()
+	return outOnly.Bytes(), outAndErr.Bytes(), err
+}