Merge pull request #30926 from jcmoraisjr/NE-2529-dcm-e2e-tests

NE-2529: add new dcm e2e tests

Author: openshift-merge-bot[bot]

go.mod

@@ -61,10 +61,10 @@ require (
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/openshift-eng/openshift-tests-extension v0.0.0-20260127124016-0fed2b824818
 	github.com/openshift-kni/commatrix v0.0.5-0.20251111204857-e5a931eff73f
-	github.com/openshift/api v0.0.0-20260302174620-dcac36b908db
+	github.com/openshift/api v0.0.0-20260327065519-582dc3d316b7
 	github.com/openshift/apiserver-library-go v0.0.0-20260303173613-cd3676268d31
 	github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee
-	github.com/openshift/client-go v0.0.0-20260302182750-20813ce71ca6
+	github.com/openshift/client-go v0.0.0-20260330134249-7e1499aaacd7
 	github.com/openshift/library-go v0.0.0-20260303171201-5d9eb6295ff6
 	github.com/ovn-org/ovn-kubernetes/go-controller v0.0.0-20250118001652-a8b9c3c31417
 	github.com/pborman/uuid v1.2.0

go.sum

@@ -848,14 +848,14 @@ github.com/openshift-eng/openshift-tests-extension v0.0.0-20260127124016-0fed2b8
 github.com/openshift-eng/openshift-tests-extension v0.0.0-20260127124016-0fed2b824818/go.mod h1:6gkP5f2HL0meusT0Aim8icAspcD1cG055xxBZ9yC68M=
 github.com/openshift-kni/commatrix v0.0.5-0.20251111204857-e5a931eff73f h1:E72Zoc+JImPehBrXkgaCbIDbSFuItvyX6RCaZ0FQE5k=
 github.com/openshift-kni/commatrix v0.0.5-0.20251111204857-e5a931eff73f/go.mod h1:cDVdp0eda7EHE6tLuSeo4IqPWdAX/KJK+ogBirIGtsI=
-github.com/openshift/api v0.0.0-20260302174620-dcac36b908db h1:MOQ5JSIlbP4apwTrEdNpApT6PsnB0/1S6y9aKODp5Ks=
-github.com/openshift/api v0.0.0-20260302174620-dcac36b908db/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
+github.com/openshift/api v0.0.0-20260327065519-582dc3d316b7 h1:7AmoMSqTryaZu65nij6EACe8+DmlMlmR1giaUx5S5sQ=
+github.com/openshift/api v0.0.0-20260327065519-582dc3d316b7/go.mod h1:pyVjK0nZ4sRs4fuQVQ4rubsJdahI1PB94LnQ8sGdvxo=
 github.com/openshift/apiserver-library-go v0.0.0-20260303173613-cd3676268d31 h1:oYPQMrkzyk002L5aN8I2tkUHTEu9lsVrc1qiJmHJdXU=
 github.com/openshift/apiserver-library-go v0.0.0-20260303173613-cd3676268d31/go.mod h1:mnTsMMTtXSPBQzqBp5HXBjLvliveKenRADFQy9m5jc0=
 github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee h1:+Sp5GGnjHDhT/a/nQ1xdp43UscBMr7G5wxsYotyhzJ4=
 github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
-github.com/openshift/client-go v0.0.0-20260302182750-20813ce71ca6 h1:wJv4Ia+R4OxoaJcTUyvMtBc5rWFvfTiEA8d5f1MBPqI=
-github.com/openshift/client-go v0.0.0-20260302182750-20813ce71ca6/go.mod h1:3lkVff575BlbDUUhMsrD1IyvfkZ+oKUB7iZuVy1m0W0=
+github.com/openshift/client-go v0.0.0-20260330134249-7e1499aaacd7 h1:5GSoQlywIwYsRCw3qN+ZDmN6HrXTMZfI33bdRNm2jRQ=
+github.com/openshift/client-go v0.0.0-20260330134249-7e1499aaacd7/go.mod h1:HhXTUIMhgzxR3Ln/zEkr4QjTL0NN7A+t9Py/we9j2ug=
 github.com/openshift/kubernetes v0.0.0-20260305123649-d18f3f005eaa h1:4TK07egSJrny442x0Kl0HgzXgt2lnCKTKHF3sbL2U3E=
 github.com/openshift/kubernetes v0.0.0-20260305123649-d18f3f005eaa/go.mod h1:1r2FIoYrPU0110cjYlWAwNcbiqRPLWAgmZK4d0YeEZw=
 github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20260305123649-d18f3f005eaa h1:ifOqAFthJWnT1HS6Sq2AcLQWNSJ1+XEiyA9eo+PIcR0=

test/extended/router/config_manager.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 	"net"
+	"net/http"
 	"strconv"
-	"strings"
 	"time"
 
 	g "github.com/onsi/ginkgo/v2"
@@ -14,11 +14,11 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/wait"
-	e2eoutput "k8s.io/kubernetes/test/e2e/framework/pod/output"
 	"k8s.io/pod-security-admission/api"
 	utilpointer "k8s.io/utils/pointer"
 
@@ -832,77 +832,41 @@ const (
 )
 
 func createRoute(oc *exutil.CLI, routeType routeType, routeName, serviceName, hostName, path string) error {
-	var err error
-	switch routeType {
-	case routeTypeInsecure:
-		// --labels on `oc expose` up to 4.21 does not override the ones coming from service's selector,
-		// so we're labeling the router after creating it. https://issues.redhat.com/browse/OCPBUGS-74543
-		err = oc.AsAdmin().Run("expose").Args("service", serviceName, "--name", routeName, "--hostname", hostName, "--path", path).Execute()
-	case routeTypePassthrough:
-		err = oc.AsAdmin().Run("create").Args("route", routeTypePassthrough, routeName, "--service", serviceName, "--hostname", hostName).Execute()
-	default:
-		err = oc.AsAdmin().Run("create").Args("route", string(routeType), routeName, "--service", serviceName, "--hostname", hostName, "--path", path).Execute()
+	route := types.NamespacedName{
+		Namespace: oc.Namespace(),
+		Name:      routeName,
 	}
-	if err != nil {
-		return err
-	}
-	return oc.AsAdmin().Run("label").Args("route", routeName, "select=haproxy-cfgmgr").Execute()
+	return createNamedRoute(context.Background(), oc, routeType, route, serviceName, hostName, path, nil, labels.Set{"select": "haproxy-cfgmgr"})
 }
 
 func readURL(ns, execPodName, host, abspath, ipaddr string) (string, error) {
-	host = exutil.IPUrl(host)
-	proto := "http"
-	port := 80
-	uri := fmt.Sprintf("%s://%s:%d%s", proto, host, port, abspath)
-	cmd := fmt.Sprintf("curl -ksfL -m 5 --resolve %s:%d:%s %q", host, port, ipaddr, uri)
-	output, err := e2eoutput.RunHostCmd(ns, execPodName, cmd)
+	execPod := execPodRef{
+		NamespacedName: types.NamespacedName{
+			Namespace: ns,
+			Name:      execPodName,
+		},
+		ipAddress: ipaddr,
+	}
+	secure := false
+	code, output, err := execPodReadURL(execPod, host, secure, abspath)
 	if err != nil {
 		return "", err
 	}
-	return strings.TrimSpace(output), nil
+	if code == 0 || code >= 400 {
+		return "", fmt.Errorf("request failed: response code: %d output: %s", code, output)
+	}
+	return output, nil
 }
 
 func waitForRouteToRespond(ns, execPodName, proto, host, abspath, ipaddr string, port int) error {
-	// bracket IPv6 IPs when used as URI
-	host = exutil.IPUrl(host)
-	if port == 0 {
-		switch proto {
-		case "http":
-			port = 80
-		case "https":
-			port = 443
-		default:
-			port = 80
-		}
-	}
-	uri := fmt.Sprintf("%s://%s:%d%s", proto, host, port, abspath)
-	cmd := fmt.Sprintf(`
-		set -e
-		STOP=$(($(date '+%%s') + %d))
-		while [ $(date '+%%s') -lt $STOP ]; do
-			rc=0
-			code=$( curl -k -s -m 5 -o /dev/null -w '%%{http_code}\n' --resolve %s:%d:%s %q ) || rc=$?
-			if [[ "${rc:-0}" -eq 0 ]]; then
-				echo $code
-				if [[ $code -eq 200 ]]; then
-					exit 0
-				fi
-				if [[ $code -ne 503 ]]; then
-					exit 1
-				fi
-			else
-				echo "error ${rc}" 1>&2
-			fi
-			sleep 1
-		done
-		`, timeoutSeconds, host, port, ipaddr, uri)
-	output, err := e2eoutput.RunHostCmd(ns, execPodName, cmd)
-	if err != nil {
-		return fmt.Errorf("host command failed: %v\n%s", err, output)
-	}
-	lines := strings.Split(strings.TrimSpace(output), "\n")
-	if lines[len(lines)-1] != "200" {
-		return fmt.Errorf("last response from server was not 200:\n%s", output)
+	execPod := execPodRef{
+		NamespacedName: types.NamespacedName{
+			Namespace: ns,
+			Name:      execPodName,
+		},
+		ipAddress: ipaddr,
 	}
-	return nil
+	secure := proto == "https"
+	_, err := execPodWaitURL(context.Background(), execPod, host, secure, abspath, http.StatusOK, timeoutSeconds*time.Second)
+	return err
 }