e2e: remove old static test infrastructure and clean up

Author: joelanford

Makefile

@@ -260,7 +260,6 @@ e2e: #EXHELP Run the e2e tests.
 	go test -count=1 -v ./test/e2e/features_test.go -timeout=$(E2E_TIMEOUT)
 
 export CLUSTER_REGISTRY_HOST := docker-registry.operator-controller-e2e.svc:5000
-export LOCAL_REGISTRY_HOST := localhost:30000
 .PHONY: extension-developer-e2e
 extension-developer-e2e: export OPERATOR_SDK := $(OPERATOR_SDK)
 extension-developer-e2e: export CONTAINER_RUNTIME := $(CONTAINER_RUNTIME)

go.mod

@@ -141,6 +141,7 @@ require (
 	github.com/google/gnostic-models v0.7.1 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
+	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
 	github.com/gosuri/uitable v0.0.4 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect
@@ -172,6 +173,7 @@ require (
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/locker v1.0.1 // indirect
+	github.com/moby/spdystream v0.5.0 // indirect
 	github.com/moby/sys/capability v0.4.0 // indirect
 	github.com/moby/sys/mountinfo v0.7.2 // indirect
 	github.com/moby/sys/sequential v0.6.0 // indirect
@@ -182,6 +184,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/nxadm/tail v1.4.11 // indirect
 	github.com/onsi/gomega v1.39.1 // indirect
 	github.com/opencontainers/runtime-spec v1.3.0 // indirect

go.sum

@@ -34,6 +34,8 @@ github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpH
 github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
 github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
 github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so=
 github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -274,6 +276,8 @@ github.com/gorilla/handlers v1.5.2 h1:cLTUSsNkgcwhgRqvCNmdbRWG0A3N4F+M2nWKdScwyE
 github.com/gorilla/handlers v1.5.2/go.mod h1:dX+xVpaxdSw+q0Qek8SSsl3dfMk3jNddUkMzo0GtH0w=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
+github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo=
+github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA=
 github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY=
 github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
@@ -369,6 +373,8 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
 github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
+github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU=
+github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
 github.com/moby/sys/capability v0.4.0 h1:4D4mI6KlNtWMCM1Z/K0i7RV1FkX+DBDHKVJpCndZoHk=
 github.com/moby/sys/capability v0.4.0/go.mod h1:4g9IK291rVkms3LKCDOoYlnV8xKwoDTpIrNEE35Wq0I=
 github.com/moby/sys/mountinfo v0.7.2 h1:1shs6aH5s4o5H2zQLn796ADW1wMrIwHsyJ2v9KouLrg=
@@ -393,6 +399,8 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
 github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
 github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
 github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=

kind-config/kind-config-2node.yaml

@@ -3,11 +3,6 @@ kind: Cluster
 nodes:
   - role: control-plane
     extraPortMappings:
-    # e2e image registry service's NodePort
-      - containerPort: 30000
-        hostPort: 30000
-        listenAddress: "127.0.0.1"
-        protocol: tcp
     # prometheus metrics service's NodePort
       - containerPort: 30900
         hostPort: 30900

kind-config/kind-config.yaml

@@ -3,11 +3,6 @@ kind: Cluster
 nodes:
   - role: control-plane
     extraPortMappings:
-    # e2e image registry service's NodePort
-      - containerPort: 30000
-        hostPort: 30000
-        listenAddress: "127.0.0.1"
-        protocol: tcp
     # prometheus metrics service's NodePort
       - containerPort: 30900
         hostPort: 30900

test/e2e/README.md

@@ -277,7 +277,6 @@ go test test/e2e/features_test.go --log.debug --k8s.cli=oc
 
 - `KUBECONFIG`: Path to kubeconfig file (defaults to `~/.kube/config`)
 - `E2E_SUMMARY_OUTPUT`: Path to write test summary (optional)
-- `LOCAL_REGISTRY_HOST`: Local registry host for pushing catalog images (default: `localhost:30000`)
 - `CLUSTER_REGISTRY_HOST`: In-cluster registry host for pulling catalog images
 
 ## Design Patterns

test/e2e/steps/steps.go

@@ -72,6 +72,23 @@ var (
 		}
 		return testregistry.Deploy(context.Background(), cfg, testregistry.DefaultNamespace, testregistry.DefaultName)
 	})
+	startRegistryPortForward = sync.OnceValues(func() (string, error) {
+		if err := deployImageRegistry(); err != nil {
+			return "", err
+		}
+		cfg, err := ctrl.GetConfig()
+		if err != nil {
+			return "", fmt.Errorf("failed to get kubeconfig: %w", err)
+		}
+		// Port-forward lives for the duration of the test process;
+		// the stop function is not needed because the goroutine is
+		// cleaned up on process exit.
+		localAddr, _, err := testregistry.PortForward(context.Background(), cfg, testregistry.DefaultNamespace, testregistry.DefaultName)
+		if err != nil {
+			return "", fmt.Errorf("failed to start port-forward to registry: %w", err)
+		}
+		return localAddr, nil
+	})
 )
 
 func RegisterSteps(sc *godog.ScenarioContext) {
@@ -226,18 +243,19 @@ func projectRootDir() string {
 	}
 }
 
-// registryHosts returns the local and in-cluster registry addresses from environment
-// variables, falling back to defaults suitable for kind clusters.
-func registryHosts() (string, string) {
-	local := os.Getenv("LOCAL_REGISTRY_HOST")
-	if local == "" {
-		local = "localhost:30000"
+// registryHosts returns the local and in-cluster registry addresses.
+// The local address is obtained by port-forwarding to the in-cluster registry,
+// which works regardless of the cluster's network topology.
+func registryHosts() (string, string, error) {
+	local, err := startRegistryPortForward()
+	if err != nil {
+		return "", "", fmt.Errorf("failed to get local registry address: %w", err)
 	}
 	cluster := os.Getenv("CLUSTER_REGISTRY_HOST")
 	if cluster == "" {
 		cluster = "docker-registry.operator-controller-e2e.svc.cluster.local:5000"
 	}
-	return local, cluster
+	return local, cluster, nil
 }
 
 // ImageRegistryIsAvailable ensures the in-cluster image registry is deployed and ready.
@@ -1445,7 +1463,10 @@ func CatalogVersionWithPackages(ctx context.Context, catalogUserName, version st
 	}
 
 	cat := catalog.NewCatalog(catalogUserName, sc.id, pkgOpts...)
-	localRegistry, clusterRegistry := registryHosts()
+	localRegistry, clusterRegistry, err := registryHosts()
+	if err != nil {
+		return err
+	}
 
 	result, err := cat.Build(ctx, version, localRegistry, clusterRegistry)
 	if err != nil {
@@ -1495,7 +1516,10 @@ func ScenarioCatalogIsUpdatedToVersion(ctx context.Context, catalogUserName, ver
 
 // ScenarioCatalogTagImage tags an existing per-scenario catalog image with a new tag.
 func ScenarioCatalogTagImage(ctx context.Context, catalogUserName, oldTag, newTag string) error {
-	localRegistry, _ := registryHosts()
+	localRegistry, _, err := registryHosts()
+	if err != nil {
+		return err
+	}
 	sc := scenarioCtx(ctx)
 	imageRef := fmt.Sprintf("%s/e2e/%s-catalog-%s:%s", localRegistry, catalogUserName, sc.id, oldTag)
 	return crane.Tag(imageRef, newTag, crane.Insecure)
@@ -1592,7 +1616,10 @@ func CatalogWithPackages(ctx context.Context, catalogUserName string, table *god
 	}
 
 	cat := catalog.NewCatalog(catalogUserName, sc.id, pkgOpts...)
-	localRegistry, clusterRegistry := registryHosts()
+	localRegistry, clusterRegistry, err := registryHosts()
+	if err != nil {
+		return err
+	}
 
 	result, err := cat.Build(ctx, "v1", localRegistry, clusterRegistry)
 	if err != nil {

test/extension-developer-e2e/extension_developer_test.go

@@ -29,17 +29,27 @@ const (
 )
 
 func TestMain(m *testing.M) {
+	ctx := context.Background()
 	cfg := ctrl.GetConfigOrDie()
-	if err := testregistry.Deploy(context.Background(), cfg, testregistry.DefaultNamespace, testregistry.DefaultName); err != nil {
+	if err := testregistry.Deploy(ctx, cfg, testregistry.DefaultNamespace, testregistry.DefaultName); err != nil {
 		panic(fmt.Sprintf("failed to deploy image registry: %v", err))
 	}
 
+	// Port-forward lives for the duration of the test process;
+	// the stop function is not needed because the goroutine is
+	// cleaned up on process exit.
+	localAddr, _, err := testregistry.PortForward(ctx, cfg, testregistry.DefaultNamespace, testregistry.DefaultName)
+	if err != nil {
+		panic(fmt.Sprintf("failed to port-forward to registry: %v", err))
+	}
+
 	clusterRegistryHost := os.Getenv("CLUSTER_REGISTRY_HOST")
 	if clusterRegistryHost == "" {
 		panic("CLUSTER_REGISTRY_HOST environment variable must be set")
 	}
 
 	// Set env vars for setup.sh — single source of truth
+	os.Setenv("LOCAL_REGISTRY_HOST", localAddr)
 	os.Setenv("CATALOG_TAG", catalogTag)
 	os.Setenv("REG_PKG_NAME", regPkgName)