only conditionally register the tproxy image with terraform

hashicorp · Nov 8, 2023 · 22a3e0f · 22a3e0f
1 parent 588545d
commit 22a3e0f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/testing/deployer/sprawl/internal/build/docker.go b/testing/deployer/sprawl/internal/build/docker.go
@@ -102,13 +102,7 @@ func DockerImages(
 	built := make(map[string]struct{})
 	for _, c := range t.Clusters {
 		for _, n := range c.Nodes {
-			needsTproxy := false
-			for _, svc := range n.Services {
-				if svc.EnableTransparentProxy {
-					needsTproxy = true
-					break
-				}
-			}
+			needsTproxy := n.NeedsTransparentProxy()
 
 			joint := n.Images.EnvoyConsulImage()
 			if _, ok := built[joint]; joint != "" && !ok {

diff --git a/testing/deployer/sprawl/internal/tfgen/gen.go b/testing/deployer/sprawl/internal/tfgen/gen.go
@@ -262,7 +262,9 @@ func (g *Generator) Generate(step Step) error {
 				addImage("", node.Images.Consul)
 				addImage("", node.Images.EnvoyConsulImage())
 				addImage("", node.Images.LocalDataplaneImage())
-				addImage("", node.Images.LocalDataplaneTProxyImage())
+				if node.NeedsTransparentProxy() {
+					addImage("", node.Images.LocalDataplaneTProxyImage())
+				}
 
 				if node.IsAgent() {
 					addVolume(node.DockerName())

diff --git a/testing/deployer/topology/topology.go b/testing/deployer/topology/topology.go
@@ -679,6 +679,15 @@ func (n *Node) SortedServices() []*Service {
 	return out
 }
 
+func (n *Node) NeedsTransparentProxy() bool {
+	for _, svc := range n.Services {
+		if svc.EnableTransparentProxy {
+			return true
+		}
+	}
+	return false
+}
+
 // DigestExposedPorts returns true if it was changed.
 func (n *Node) DigestExposedPorts(ports map[int]int) bool {
 	if reflect.DeepEqual(n.usedPorts, ports) {