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

Ensure partition is used for SAN validation

This commit is contained in:
freddygv 2021-09-14 20:43:38 -06:00
parent 7ecbac9228
commit 9cd30e8650
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agent/xds/clusters.go
View File

@ -639,10 +639,9 @@ func (s *ResourceGenerator) makeUpstreamClustersForDiscoveryChain(
targetSpiffeID := connect.SpiffeIDService{ targetSpiffeID := connect.SpiffeIDService{
Host: cfgSnap.Roots.TrustDomain, Host: cfgSnap.Roots.TrustDomain,
Namespace: target.Namespace, Namespace: target.Namespace,
Partition: target.Partition,
Datacenter: target.Datacenter, Datacenter: target.Datacenter,
Service: target.Service, Service: target.Service,
// TODO(partitions) Store partition
} }
if failoverThroughMeshGateway { if failoverThroughMeshGateway {
@ -676,10 +675,9 @@ func (s *ResourceGenerator) makeUpstreamClustersForDiscoveryChain(
id := connect.SpiffeIDService{ id := connect.SpiffeIDService{
Host: cfgSnap.Roots.TrustDomain, Host: cfgSnap.Roots.TrustDomain,
Namespace: target.Namespace, Namespace: target.Namespace,
Partition: target.Partition,
Datacenter: target.Datacenter, Datacenter: target.Datacenter,
Service: target.Service, Service: target.Service,
// TODO(partitions) Store partition
} }
// Failover targets might be subsets of the same service, so these are deduplicated. // Failover targets might be subsets of the same service, so these are deduplicated.