Merge pull request #10754 from hashicorp/b-client-connect-constraint

consul/connect: remove unnecessary connect constraint on clients
hashicorp · Jun 14, 2021 · 3a5cbc4 · 3a5cbc4
2 parents 7019bc2 + 0d13ef0
commit 3a5cbc4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/nomad/job_endpoint_hook_connect.go b/nomad/job_endpoint_hook_connect.go
@@ -89,14 +89,6 @@ func connectGatewayVersionConstraint() *structs.Constraint {
 	}
 }
 
-func connectEnabledConstraint() *structs.Constraint {
-	return &structs.Constraint{
-		LTarget: "${attr.consul.connect}",
-		RTarget: "true",
-		Operand: "=",
-	}
-}
-
 func connectListenerConstraint() *structs.Constraint {
 	return &structs.Constraint{
 		LTarget: "${attr.consul.grpc}",
@@ -459,7 +451,6 @@ func newConnectGatewayTask(prefix, service string, netHost bool) *structs.Task {
 		Resources: connectSidecarResources(),
 		Constraints: structs.Constraints{
 			connectGatewayVersionConstraint(),
-			connectEnabledConstraint(),
 			connectListenerConstraint(),
 		},
 	}
@@ -484,7 +475,6 @@ func newConnectSidecarTask(service string) *structs.Task {
 		},
 		Constraints: structs.Constraints{
 			connectSidecarVersionConstraint(),
-			connectEnabledConstraint(),
 			connectListenerConstraint(),
 		},
 	}

diff --git a/nomad/job_endpoint_hook_connect_test.go b/nomad/job_endpoint_hook_connect_test.go
@@ -195,7 +195,6 @@ func TestJobEndpointConnect_groupConnectHook_IngressGateway_CustomTask(t *testin
 			KillSignal:    "SIGHUP",
 			Constraints: structs.Constraints{
 				connectGatewayVersionConstraint(),
-				connectEnabledConstraint(),
 				connectListenerConstraint(),
 			},
 		},