From a57ebd0ad94bd4d801461cdeed61a1e5c47392c5 Mon Sep 17 00:00:00 2001
From: Julian Sommer <115516918+juliansommer@users.noreply.github.com>
Date: Fri, 12 Jun 2026 15:28:23 +1000
Subject: [PATCH] chore: remove references to pseudo multi node

---
 tests/e2e/cert/cert_test.go     | 10 ++--------
 tests/e2e/harness/cert.go       | 12 +++---------
 tests/e2e/harness/ec2helpers.go |  4 ++--
 tests/e2e/harness/env.go        |  1 -
 4 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/tests/e2e/cert/cert_test.go b/tests/e2e/cert/cert_test.go
index a995fced9..040164f8a 100644
--- a/tests/e2e/cert/cert_test.go
+++ b/tests/e2e/cert/cert_test.go
@@ -56,9 +56,6 @@ func TestCertIssuance(t *testing.T) {
 			t.Skip("hostname SAN check requires local cert path")
 		}
 		referenceIP := env.NodeIPs[0]
-		if env.Mode == harness.ModePseudo {
-			referenceIP = "10.11.12.1"
-		}
 		cert := loadCert(t, env, referenceIP, artifacts)
 		assert.True(t, harness.CertHasDNSSAN(cert, hostname),
 			"cert missing DNS SAN for hostname %q (DNS=%v)", hostname, cert.DNSNames)
@@ -121,7 +118,7 @@ func TestCertIssuance(t *testing.T) {
 		url := fmt.Sprintf("https://%s:%d/api/ca.pem", uiIP, env.UIPort)
 		code, body, err := harness.HTTPSGet(url, pool, env.DefaultTimeout)
 		if err != nil {
-			t.Skipf("UI not reachable at %s: %v (pseudo-multinode disables UI)", url, err)
+			t.Skipf("UI not reachable at %s: %v", url, err)
 		}
 		require.Equalf(t, 200, code, "GET %s returned %d", url, code)
 		downloaded, err := harness.ParseCertPEM(body)
@@ -135,9 +132,6 @@ func TestCertIssuance(t *testing.T) {
 			t.Skip("metadata check requires local cert path")
 		}
 		referenceIP := env.NodeIPs[0]
-		if env.Mode == harness.ModePseudo {
-			referenceIP = "10.11.12.1"
-		}
 		cert := loadCert(t, env, referenceIP, artifacts)
 
 		assert.Contains(t, cert.Subject.CommonName, "Spinifex Server",
@@ -178,7 +172,7 @@ func TestCertIssuance(t *testing.T) {
 // otherwise. Dumps cert text to artifacts on failure.
 func loadCert(t *testing.T, env *harness.Env, ip, artifacts string) *x509.Certificate {
 	t.Helper()
-	if path := harness.ServerCertPath(env, ip); path != "" {
+	if path := harness.ServerCertPath(env); path != "" {
 		cert, err := harness.ParseCertFile(path)
 		require.NoErrorf(t, err, "parse local cert %s", path)
 		harness.OnFailure(t, func() {
diff --git a/tests/e2e/harness/cert.go b/tests/e2e/harness/cert.go
index 1a7620222..78a64b073 100644
--- a/tests/e2e/harness/cert.go
+++ b/tests/e2e/harness/cert.go
@@ -29,7 +29,6 @@ func ResolveCACert(env *Env) (string, error) {
 		filepath.Join(env.ConfigDir, "ca.pem"),
 		"/etc/spinifex/ca.pem",
 		os.ExpandEnv("$HOME/spinifex/config/ca.pem"),
-		os.ExpandEnv("$HOME/node1/config/ca.pem"),
 	}
 	for _, c := range candidates {
 		if c == "" {
@@ -47,16 +46,11 @@ const SystemCAPath = "/usr/local/share/ca-certificates/spinifex-ca.crt"
 
 // ServerCertPath returns the local file path for a node's server cert,
 // or empty string if the cert must be fetched over the wire instead.
-func ServerCertPath(env *Env, nodeIP string) string {
-	switch env.Mode {
-	case ModeSingle:
+func ServerCertPath(env *Env) string {
+	if env.Mode == ModeSingle {
 		return filepath.Join(env.ConfigDir, "server.pem")
-	case ModePseudo:
-		octet := nodeIP[strings.LastIndex(nodeIP, ".")+1:]
-		return os.ExpandEnv("$HOME/node" + octet + "/config/server.pem")
-	default:
-		return ""
 	}
+	return ""
 }
 
 // ParseCertFile reads a PEM cert from disk and returns the parsed x509.
diff --git a/tests/e2e/harness/ec2helpers.go b/tests/e2e/harness/ec2helpers.go
index 14ca22259..a1732cc49 100644
--- a/tests/e2e/harness/ec2helpers.go
+++ b/tests/e2e/harness/ec2helpers.go
@@ -148,8 +148,8 @@ func DiscoverDefaultVPC(t *testing.T, c *AWSClient) (vpcID, sgID, subnetID strin
 			break
 		}
 	}
-	// Fall back to the first subnet if none is marked DefaultForAz — pseudo
-	// multinode skips the marker, and callers just need a usable subnet ID.
+	// Fall back to the first subnet if none is marked DefaultForAz; callers
+	// just need a usable subnet ID.
 	if subnetID == "" && len(subnets.Subnets) > 0 {
 		subnetID = aws.StringValue(subnets.Subnets[0].SubnetId)
 	}
diff --git a/tests/e2e/harness/env.go b/tests/e2e/harness/env.go
index aa8141c91..649e78d83 100644
--- a/tests/e2e/harness/env.go
+++ b/tests/e2e/harness/env.go
@@ -19,7 +19,6 @@ type Mode string
 
 const (
 	ModeSingle    Mode = "single"
-	ModePseudo    Mode = "pseudo"
 	ModeMultinode Mode = "multinode"
 	ModeBaremetal Mode = "baremetal"
 )