status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

NET-6097 - sidecar proxy controller - give name to first failover policy target (#19239)

This commit is contained in:
John Murret 2023-10-16 19:45:54 -06:00 committed by GitHub
parent 8eb074e7c1
commit 9f4f99c626
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go
View File

@ -287,7 +287,12 @@ func (b *Builder) buildDestination(
) )
clusterName := fmt.Sprintf("%s.%s", portName, sni) clusterName := fmt.Sprintf("%s.%s", portName, sni)
egBase := b.newClusterEndpointGroup("", sni, portName, details.IdentityRefs, connectTimeout, loadBalancer) egName := ""
if details.FailoverConfig != nil {
egName = fmt.Sprintf("%s%d~%s", xdscommon.FailoverClusterNamePrefix, 0, clusterName)
}
egBase := b.newClusterEndpointGroup(egName, sni, portName, details.IdentityRefs, connectTimeout, loadBalancer)
var endpointGroups []*pbproxystate.EndpointGroup var endpointGroups []*pbproxystate.EndpointGroup
@ -319,7 +324,10 @@ func (b *Builder) buildDestination(
destDC, destDC,
b.trustDomain, b.trustDomain,
) )
destClusterName := fmt.Sprintf("%s%d~%s", xdscommon.FailoverClusterNamePrefix, i, clusterName)
// index 0 was already given to non-fail original
failoverGroupIndex := i + 1
destClusterName := fmt.Sprintf("%s%d~%s", xdscommon.FailoverClusterNamePrefix, failoverGroupIndex, clusterName)
egDest := b.newClusterEndpointGroup(destClusterName, destSNI, destPortName, destDetails.IdentityRefs, destConnectTimeout, destLoadBalancer) egDest := b.newClusterEndpointGroup(destClusterName, destSNI, destPortName, destDetails.IdentityRefs, destConnectTimeout, destLoadBalancer)

7
internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination.golden vendored
View File

@ -30,7 +30,8 @@
} }
} }
} }
} },
"name": "failover-target~0~http.api-1.default.dc1.internal.foo.consul"
}, },
{ {
"dynamic": { "dynamic": {
@ -54,7 +55,7 @@
} }
} }
}, },
"name": "failover-target~0~http.api-1.default.dc1.internal.foo.consul" "name": "failover-target~1~http.api-1.default.dc1.internal.foo.consul"
} }
] ]
}, },
@ -310,7 +311,7 @@
} }
}, },
"requiredEndpoints": { "requiredEndpoints": {
"failover-target~0~http.api-1.default.dc1.internal.foo.consul": { "failover-target~1~http.api-1.default.dc1.internal.foo.consul": {
"id": { "id": {
"name": "backup-1", "name": "backup-1",
"tenancy": { "tenancy": {