From 6f4e0376213e5c3630ceaed85dc7b6363112fe68 Mon Sep 17 00:00:00 2001
From: "R.B. Boyer" <4903+rboyer@users.noreply.github.com>
Date: Fri, 3 Nov 2023 16:00:48 -0500
Subject: [PATCH] testing: disable v2 linkage to nodes in integration tests
 (#19509)

---
 testing/deployer/sprawl/catalog.go | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/testing/deployer/sprawl/catalog.go b/testing/deployer/sprawl/catalog.go
index b19626ba7df2..fdc95c9f6893 100644
--- a/testing/deployer/sprawl/catalog.go
+++ b/testing/deployer/sprawl/catalog.go
@@ -297,7 +297,16 @@ func (s *Sprawl) registerCatalogNode(
 	node *topology.Node,
 ) error {
 	if node.IsV2() {
-		return s.registerCatalogNodeV2(cluster, node)
+
+		// TODO(rb): nodes are optional in v2 and won't be used in k8s by
+		// default. There are some scoping issues with the Node Type in 1.17 so
+		// disable it for now.
+		//
+		// To re-enable you also need to link it to the Workload by setting the
+		// NodeName field.
+		//
+		// return s.registerCatalogNodeV2(cluster, node)
+		return nil
 	}
 	return s.registerCatalogNodeV1(cluster, node)
 }
@@ -538,7 +547,8 @@ func serviceInstanceToResources(
 				Metadata: svc.Meta,
 			},
 			Data: &pbcatalog.Workload{
-				NodeName: node.PodName(),
+				// TODO(rb): disabling this until node scoping makes sense again
+				// NodeName: node.PodName(),
 				Identity: svc.ID.Name,
 				Ports:    wlPorts,
 				Addresses: []*pbcatalog.WorkloadAddress{