kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-08 19:35:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
consul/connect: remove unnecessary connect constraint on clients
This commit is contained in:
Seth Hoenig
2021-06-14 09:41:25 -05:00
committed by GitHub
parent 7019bc2b9c 0d13ef0c75
commit 3a5cbc4713
2 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nomad/job_endpoint_hook_connect.go
View File

@@ -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(),
},
}

1
nomad/job_endpoint_hook_connect_test.go
View File

@@ -195,7 +195,6 @@ func TestJobEndpointConnect_groupConnectHook_IngressGateway_CustomTask(t *testin
KillSignal: "SIGHUP",
Constraints: structs.Constraints{
connectGatewayVersionConstraint(),
connectEnabledConstraint(),
connectListenerConstraint(),
},
},