luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Add TODOs about partition handling

This commit is contained in:
freddygv 2021-06-30 16:16:16 -06:00
parent 3d4fa44c22
commit b6b42c34dc
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
agent/proxycfg/state_test.go
View File

@ -1870,7 +1870,8 @@ func TestState_WatchesAndUpdates(t *testing.T) {
SNI: connect.ServiceSNI("db", "", structs.IntentionDefaultNamespace, snap.Datacenter, snap.Roots.TrustDomain), SNI: connect.ServiceSNI("db", "", structs.IntentionDefaultNamespace, snap.Datacenter, snap.Roots.TrustDomain),
SpiffeID: connect.SpiffeIDService{ SpiffeID: connect.SpiffeIDService{
Host: snap.Roots.TrustDomain, Host: snap.Roots.TrustDomain,
Namespace: structs.IntentionDefaultNamespace, Namespace: db.NamespaceOrDefault(),
Partition: db.PartitionOrDefault(),
Datacenter: snap.Datacenter, Datacenter: snap.Datacenter,
Service: "db", Service: "db",
}, },

2
agent/proxycfg/upstreams.go
View File

@ -96,7 +96,7 @@ func (s *handlerUpstreams) handleUpdateUpstreams(ctx context.Context, u cache.Up
spiffeID := connect.SpiffeIDService{ spiffeID := connect.SpiffeIDService{
Host: snap.Roots.TrustDomain, Host: snap.Roots.TrustDomain,
Partition: "", Partition: svc.PartitionOrDefault(),
Namespace: svc.NamespaceOrDefault(), Namespace: svc.NamespaceOrDefault(),
Datacenter: snap.Datacenter, Datacenter: snap.Datacenter,
Service: svc.Name, Service: svc.Name,

6
agent/xds/clusters.go
View File

@ -540,6 +540,8 @@ func (s *ResourceGenerator) makeUpstreamClusterForPreparedQuery(upstream structs
Namespace: upstream.DestinationNamespace, Namespace: upstream.DestinationNamespace,
Datacenter: dc, Datacenter: dc,
Service: upstream.DestinationName, Service: upstream.DestinationName,
// TODO(partitions) Store partition
} }
// Enable TLS upstream with the configured client certificate. // Enable TLS upstream with the configured client certificate.
@ -623,6 +625,8 @@ func (s *ResourceGenerator) makeUpstreamClustersForDiscoveryChain(
Namespace: target.Namespace, Namespace: target.Namespace,
Datacenter: target.Datacenter, Datacenter: target.Datacenter,
Service: target.Service, Service: target.Service,
// TODO(partitions) Store partition
} }
if failoverThroughMeshGateway { if failoverThroughMeshGateway {
@ -658,6 +662,8 @@ func (s *ResourceGenerator) makeUpstreamClustersForDiscoveryChain(
Namespace: target.Namespace, Namespace: target.Namespace,
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.