Fixup prepared query ns defaulting

2021-07-15 09:37:37 -06:00 · 2021-07-15 09:37:37 -06:00 · 803df59268
parent 066e950b7d
commit 803df59268
1 changed files with 6 additions and 1 deletions
--- a/agent/xds/clusters.go
+++ b/agent/xds/clusters.go
@ -535,9 +535,14 @@ func (s *ResourceGenerator) makeUpstreamClusterForPreparedQuery(upstream structs
 		}
 	}

+	ns := upstream.DestinationNamespace
+	if ns == "" {
+		ns = structs.IntentionDefaultNamespace
+	}
+
 	spiffeID := connect.SpiffeIDService{
 		Host:       cfgSnap.Roots.TrustDomain,
-		Namespace:  upstream.DestinationNamespace,
+		Namespace:  ns,
 		Datacenter: dc,
 		Service:    upstream.DestinationName,
 	}