[DNM] k8s gateway cluster names

changelog/v1.18.0-rc4/kubegateway-clusternames.yaml

@@ -0,0 +1,10 @@
+changelog:
+  - type: BREAKING_CHANGE
+    issueLink: https://github.com/solo-io/solo-projects/issues/7105
+    resolvesIssue: false
+    description: >-
+      When using the Kubernetes Gateway API, envoy cluster names corresponding to Kubernetes Service Upstreams
+      are now in a new more parseable format that allows us to extract info about the Service for metrics:
+      `upstreamName_upstreamNs_svcNs_svcName_svcPort` (underscore-separated). Note that as long as Kubernetes
+      Gateway integration is enabled (i.e. Gloo Gateway installed with `kubeGateway.enabled=true`), both
+      Edge and Kubernetes Gateway proxies will use the new cluster format.

projects/discovery/pkg/fds/updater.go

@@ -16,7 +16,6 @@ import (
 
 	v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1"
 	plugins "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options"
-	"github.com/solo-io/gloo/projects/gloo/pkg/translator"
 )
 
 var errorUndetectableUpstream = errors.New("upstream type cannot be detected")
@@ -115,7 +114,7 @@ func (u *Updater) UpstreamUpdated(upstream *v1.Upstream) {
 
 func (u *Updater) UpstreamAdded(upstream *v1.Upstream) {
 	// upstream already tracked. ignore.
-	key := translator.UpstreamToClusterName(upstream.GetMetadata().Ref())
+	key := upstream.GetMetadata().Ref().Key()
 	if _, ok := u.activeUpstreams[key]; ok {
 		return
 	}
@@ -144,7 +143,7 @@ func (u *Updater) UpstreamAdded(upstream *v1.Upstream) {
 }
 
 func (u *Updater) UpstreamRemoved(upstream *v1.Upstream) {
-	key := translator.UpstreamToClusterName(upstream.GetMetadata().Ref())
+	key := upstream.GetMetadata().Ref().Key()
 	if upstreamState, ok := u.activeUpstreams[key]; ok {
 		upstreamState.cancel()
 		delete(u.activeUpstreams, key)

projects/gateway/pkg/syncer/translator_syncer.go

@@ -12,7 +12,6 @@ import (
 	"github.com/solo-io/gloo/pkg/utils/statsutils/metrics"
 	"github.com/solo-io/gloo/pkg/utils/syncutil"
 
-	gloo_translator "github.com/solo-io/gloo/projects/gloo/pkg/translator"
 	"github.com/solo-io/solo-kit/pkg/api/v1/clients"
 	"github.com/solo-io/solo-kit/pkg/errors"
 	"go.uber.org/zap/zapcore"
@@ -230,7 +229,7 @@ func (s *statusSyncer) setCurrentProxies(desiredProxies reconciler.GeneratedProx
 	// floating around.  Historically, they were there to envorce an alphabetical processing of
 	//  `proxyToLastStatus`.  See https://github.com/solo-io/gloo/issues/5812 for more details.
 	for proxyRef, reports := range proxyReportsByRef {
-		refKey := gloo_translator.UpstreamToClusterName(proxyRef)
+		refKey := glooutils.ResourceRefToKey(proxyRef)
 		if _, ok := s.proxyToLastStatus[refKey]; !ok {
 			s.proxyToLastStatus[refKey] = reportsAndStatus{}
 		}
@@ -295,7 +294,7 @@ func (s *statusSyncer) setStatuses(list gloov1.ProxyList) {
 	defer s.mapLock.Unlock()
 	for _, proxy := range list {
 		ref := proxy.GetMetadata().Ref()
-		refKey := gloo_translator.UpstreamToClusterName(ref)
+		refKey := glooutils.ResourceRefToKey(ref)
 		status := s.statusClient.GetStatus(proxy)
 		if current, ok := s.proxyToLastStatus[refKey]; ok {
 			current.Status = status
@@ -359,7 +358,7 @@ func (s *statusSyncer) extractCurrentReports() (reporter.ResourceReports, map[re
 
 	var refKeys []string
 	for _, ref := range s.currentGeneratedProxies {
-		refKeys = append(refKeys, gloo_translator.UpstreamToClusterName(ref))
+		refKeys = append(refKeys, glooutils.ResourceRefToKey(ref))
 	}
 
 	// iterate over proxyToLastStatus by alphabetical ordering of keys

projects/gateway/pkg/syncer/translator_syncer_test.go

@@ -22,7 +22,7 @@ import (
 	gloov1snap "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/gloosnapshot"
 	"github.com/solo-io/gloo/projects/gloo/pkg/defaults"
 	gloomocks "github.com/solo-io/gloo/projects/gloo/pkg/mocks"
-	"github.com/solo-io/gloo/projects/gloo/pkg/translator"
+	"github.com/solo-io/gloo/projects/gloo/pkg/utils"
 	"github.com/solo-io/solo-kit/pkg/api/v1/resources"
 	"github.com/solo-io/solo-kit/pkg/api/v1/resources/core"
 	"github.com/solo-io/solo-kit/pkg/api/v2/reporter"
@@ -82,7 +82,7 @@ var _ = Describe("TranslatorSyncer", func() {
 		err := syncer.syncStatus(context.Background())
 		Expect(err).NotTo(HaveOccurred())
 		reportedKey := getMapOnlyKey(mockReporter.Reports())
-		Expect(reportedKey).To(Equal(translator.UpstreamToClusterName(vs.GetMetadata().Ref())))
+		Expect(reportedKey).To(Equal(utils.ResourceRefToKey(vs.GetMetadata().Ref())))
 		Expect(mockReporter.Reports()[reportedKey]).To(BeEquivalentTo(errs[vs]))
 		m := map[string]*core.Status{
 			"*v1.Proxy.test_gloo-system": {State: core.Status_Accepted},
@@ -137,7 +137,7 @@ var _ = Describe("TranslatorSyncer", func() {
 		Expect(err).NotTo(HaveOccurred())
 
 		reportedKey := getMapOnlyKey(mockReporter.Reports())
-		Expect(reportedKey).To(Equal(translator.UpstreamToClusterName(rt.GetMetadata().Ref())))
+		Expect(reportedKey).To(Equal(utils.ResourceRefToKey(rt.GetMetadata().Ref())))
 
 		Expect(reportContainsWarning(mockReporter.Reports()[reportedKey], "warning 1")).To(BeTrue())
 		Expect(reportContainsWarning(mockReporter.Reports()[reportedKey], "warning 2")).To(BeTrue())
@@ -183,7 +183,7 @@ var _ = Describe("TranslatorSyncer", func() {
 		syncer.handleUpdatedProxies(ctx)
 		Eventually(mockReporter.Reports, "5s", "0.5s").ShouldNot(BeEmpty())
 		reportedKey := getMapOnlyKey(mockReporter.Reports())
-		Expect(reportedKey).To(Equal(translator.UpstreamToClusterName(vs.GetMetadata().Ref())))
+		Expect(reportedKey).To(Equal(utils.ResourceRefToKey(vs.GetMetadata().Ref())))
 		Expect(mockReporter.Reports()[reportedKey]).To(BeEquivalentTo(errs[vs]))
 		m := map[string]*core.Status{
 			"*v1.Proxy.test_gloo-system": {State: core.Status_Accepted},
@@ -218,7 +218,7 @@ var _ = Describe("TranslatorSyncer", func() {
 		syncer.handleUpdatedProxies(ctx)
 		Eventually(mockReporter.Reports, "5s", "0.5s").ShouldNot(BeEmpty())
 		reportedKey := getMapOnlyKey(mockReporter.Reports())
-		Expect(reportedKey).To(Equal(translator.UpstreamToClusterName(vs.GetMetadata().Ref())))
+		Expect(reportedKey).To(Equal(utils.ResourceRefToKey(vs.GetMetadata().Ref())))
 		Expect(mockReporter.Reports()[reportedKey]).To(BeEquivalentTo(errs[vs]))
 		m := map[string]*core.Status{
 			"*v1.Proxy.test_gloo-system": {State: core.Status_Accepted},
@@ -253,7 +253,7 @@ var _ = Describe("TranslatorSyncer", func() {
 		Expect(err).NotTo(HaveOccurred())
 
 		reportedKey := getMapOnlyKey(mockReporter.Reports())
-		Expect(reportedKey).To(Equal(translator.UpstreamToClusterName(vs.GetMetadata().Ref())))
+		Expect(reportedKey).To(Equal(utils.ResourceRefToKey(vs.GetMetadata().Ref())))
 		Expect(mockReporter.Reports()[reportedKey]).To(BeEquivalentTo(errs[vs]))
 
 		m := map[string]*core.Status{
@@ -290,7 +290,7 @@ var _ = Describe("TranslatorSyncer", func() {
 		Expect(err).NotTo(HaveOccurred())
 
 		reportedKey := getMapOnlyKey(mockReporter.Reports())
-		Expect(reportedKey).To(Equal(translator.UpstreamToClusterName(vs.GetMetadata().Ref())))
+		Expect(reportedKey).To(Equal(utils.ResourceRefToKey(vs.GetMetadata().Ref())))
 		Expect(mockReporter.Reports()[reportedKey]).To(BeEquivalentTo(errs[vs]))
 
 		m := map[string]*core.Status{
@@ -334,7 +334,7 @@ var _ = Describe("TranslatorSyncer", func() {
 		mergedErrs.AddError(vs, fmt.Errorf("invalid 2"))
 
 		reportedKey := getMapOnlyKey(mockReporter.Reports())
-		Expect(reportedKey).To(Equal(translator.UpstreamToClusterName(vs.GetMetadata().Ref())))
+		Expect(reportedKey).To(Equal(utils.ResourceRefToKey(vs.GetMetadata().Ref())))
 		Expect(mockReporter.Reports()[reportedKey]).To(BeEquivalentTo(mergedErrs[vs]))
 
 		m := map[string]*core.Status{
@@ -451,7 +451,7 @@ func (f *fakeReporter) WriteReports(ctx context.Context, errs reporter.ResourceR
 		newreports[k] = v
 	}
 	for k, v := range errs {
-		newreports[translator.UpstreamToClusterName(k.GetMetadata().Ref())] = v
+		newreports[utils.ResourceRefToKey(k.GetMetadata().Ref())] = v
 	}
 	f.reports = newreports
 
@@ -460,7 +460,7 @@ func (f *fakeReporter) WriteReports(ctx context.Context, errs reporter.ResourceR
 		newstatus[k] = v
 	}
 	for k := range errs {
-		newstatus[translator.UpstreamToClusterName(k.GetMetadata().Ref())] = subresourceStatuses
+		newstatus[utils.ResourceRefToKey(k.GetMetadata().Ref())] = subresourceStatuses
 	}
 	f.statuses = newstatus
 

projects/gateway2/krtcollections/endpoints.go

@@ -18,6 +18,7 @@ import (
 	glookubev1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/kube/apis/gloo.solo.io/v1"
 	kubeplugin "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/options/kubernetes"
 	"github.com/solo-io/gloo/projects/gloo/pkg/translator"
+	"github.com/solo-io/gloo/projects/gloo/pkg/upstreams"
 	"github.com/solo-io/go-utils/contextutils"
 	"istio.io/istio/pkg/kube"
 	"istio.io/istio/pkg/kube/kclient"
@@ -429,7 +430,7 @@ func findPortInEndpointSlice(endpointSlice *discoveryv1.EndpointSlice, singlePor
 
 // TODO: use exported version from translator?
 func GetEndpointClusterName(upstream *v1.Upstream) string {
-	clusterName := translator.UpstreamToClusterName(upstream.GetMetadata().Ref())
+	clusterName := upstreams.UpstreamToClusterName(upstream)
 	endpointClusterName, err := translator.GetEndpointClusterName(clusterName, upstream)
 	if err != nil {
 		panic(err)

projects/gateway2/proxy_syncer/cla.go

@@ -133,7 +133,7 @@ func PrioritizeEndpoints(logger *zap.Logger, destrule *DestinationRuleWrapper, e
 	var priorityInfo *PriorityInfo
 
 	if destrule != nil {
-		trafficPolicy := getTraficPolicy(destrule, ep.Port)
+		trafficPolicy := getTrafficPolicy(destrule, ep.Port)
 		localityLb := getLocalityLbSetting(trafficPolicy)
 		if localityLb != nil {
 			priorityInfo = getPriorityInfoFromDestrule(localityLb)

projects/gateway2/proxy_syncer/destrule.go

@@ -141,7 +141,7 @@ func getLocalityLbSetting(trafficPolicy *v1alpha3.TrafficPolicy) *v1alpha3.Local
 	return localityLb
 }
 
-func getTraficPolicy(destrule *DestinationRuleWrapper, port uint32) *v1alpha3.TrafficPolicy {
+func getTrafficPolicy(destrule *DestinationRuleWrapper, port uint32) *v1alpha3.TrafficPolicy {
 	trafficPolicy := destrule.Spec.GetTrafficPolicy()
 	if trafficPolicy == nil {
 		return nil

projects/gateway2/proxy_syncer/upstreams.go

@@ -138,7 +138,7 @@ func translate(ctx context.Context, settings *gloov1.Settings, translator setup.
 
 func ApplyDestRulesForUpstream(destrule *DestinationRuleWrapper, u *gloov1.Upstream) (*gloov1.Upstream, string) {
 	if destrule != nil {
-		trafficPolicy := getTraficPolicy(destrule, ggv2utils.GetPortForUpstream(u))
+		trafficPolicy := getTrafficPolicy(destrule, ggv2utils.GetPortForUpstream(u))
 		if outlier := trafficPolicy.GetOutlierDetection(); outlier != nil {
 			name := krtcollections.GetEndpointClusterName(u)
 

projects/gateway2/setup/ggv2setup.go

@@ -217,7 +217,7 @@ func (g *genericStatusReporter) WriteReports(ctx context.Context, resourceErrs r
 	for resource, report := range resourceErrsCopy {
 
 		// check if resource is an internal upstream. if so skip it..
-		if kubernetes.IsKubeUpstream(resource.GetMetadata().GetName()) {
+		if kubernetes.IsFakeKubeUpstream(resource.GetMetadata().GetName()) {
 			continue
 		}
 		// check if resource is an internal upstream. Internal upstreams have ':' in their names so

projects/gloo/cli/pkg/printers/upstream.go

@@ -135,7 +135,7 @@ func upstreamDetails(up *v1.Upstream, xdsDump *xdsinspection.XdsDump) []string {
 			fmt.Sprintf("port:           %v", usType.AwsEc2.GetPort()),
 		)
 		add(getEc2TagFiltersString(usType.AwsEc2.GetFilters())...)
-		instances := xdsDump.GetEc2InstancesForUpstream(up.GetMetadata().Ref())
+		instances := xdsDump.GetEc2InstancesForUpstream(up)
 		add(
 			"EC2 Instance Ids:",
 		)

projects/gloo/cli/pkg/xdsinspection/ec2.go

@@ -1,19 +1,19 @@
 package xdsinspection
 
 import (
+	gloov1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1"
 	"github.com/solo-io/gloo/projects/gloo/pkg/plugins/aws/ec2"
-
 	"github.com/solo-io/gloo/projects/gloo/pkg/translator"
-	"github.com/solo-io/solo-kit/pkg/api/v1/resources/core"
+	"github.com/solo-io/gloo/projects/gloo/pkg/upstreams"
 )
 
-func (xd *XdsDump) GetEc2InstancesForUpstream(upstream *core.ResourceRef) []string {
+func (xd *XdsDump) GetEc2InstancesForUpstream(upstream *gloov1.Upstream) []string {
 	var out []string
 	if xd == nil {
 		out = append(out, "use -o wide for instance details")
 		return out
 	}
-	clusterName := translator.UpstreamToClusterName(upstream)
+	clusterName := upstreams.UpstreamToClusterName(upstream)
 	endpointCount := 0
 	for _, clusterEndpoints := range xd.Endpoints {
 		if clusterEndpoints.GetClusterName() == clusterName {

projects/gloo/pkg/plugins/als/plugin_test.go

@@ -23,10 +23,10 @@ import (
 	"github.com/solo-io/solo-kit/pkg/api/v1/resources/core"
 	"github.com/solo-io/solo-kit/test/matchers"
 
+	envoygrpc "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/grpc/v3"
 	. "github.com/solo-io/gloo/projects/gloo/pkg/plugins/als"
 	translatorutil "github.com/solo-io/gloo/projects/gloo/pkg/translator"
-
-	envoygrpc "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/grpc/v3"
+	"github.com/solo-io/gloo/projects/gloo/pkg/utils"
 )
 
 var _ = Describe("Plugin", func() {
@@ -72,7 +72,7 @@ var _ = Describe("Plugin", func() {
 							GrpcService: &accessLogService.GrpcService{
 								LogName: logName,
 								ServiceRef: &accessLogService.GrpcService_StaticClusterName{
-									StaticClusterName: translatorutil.UpstreamToClusterName(usRef),
+									StaticClusterName: utils.ResourceRefToKey(usRef),
 								},
 								AdditionalRequestHeadersToLog:   extraHeaders,
 								AdditionalResponseHeadersToLog:  extraHeaders,
@@ -98,7 +98,7 @@ var _ = Describe("Plugin", func() {
 				Expect(falCfg.CommonConfig.LogName).To(Equal(logName))
 				envoyGrpc := falCfg.CommonConfig.GetGrpcService().GetEnvoyGrpc()
 				Expect(envoyGrpc).NotTo(BeNil())
-				Expect(envoyGrpc.ClusterName).To(Equal(translatorutil.UpstreamToClusterName(usRef)))
+				Expect(envoyGrpc.ClusterName).To(Equal(utils.ResourceRefToKey(usRef)))
 			})
 
 			DescribeTable("Test each filter is translated properly",
@@ -605,7 +605,7 @@ var _ = Describe("Plugin", func() {
 								GrpcService: &accessLogService.GrpcService{
 									LogName: logName,
 									ServiceRef: &accessLogService.GrpcService_StaticClusterName{
-										StaticClusterName: translatorutil.UpstreamToClusterName(usRef),
+										StaticClusterName: utils.ResourceRefToKey(usRef),
 									},
 									AdditionalRequestHeadersToLog:   extraHeaders,
 									AdditionalResponseHeadersToLog:  extraHeaders,
@@ -634,7 +634,7 @@ var _ = Describe("Plugin", func() {
 				Expect(falCfg.CommonConfig.LogName).To(Equal(logName))
 				envoyGrpc := falCfg.CommonConfig.GetGrpcService().GetEnvoyGrpc()
 				Expect(envoyGrpc).NotTo(BeNil())
-				Expect(envoyGrpc.ClusterName).To(Equal(translatorutil.UpstreamToClusterName(usRef)))
+				Expect(envoyGrpc.ClusterName).To(Equal(utils.ResourceRefToKey(usRef)))
 			})
 
 		})
@@ -787,7 +787,7 @@ var _ = Describe("Plugin", func() {
 									GrpcService: &accessLogService.GrpcService{
 										LogName: logName,
 										ServiceRef: &accessLogService.GrpcService_StaticClusterName{
-											StaticClusterName: translatorutil.UpstreamToClusterName(usRef),
+											StaticClusterName: utils.ResourceRefToKey(usRef),
 										},
 										AdditionalRequestHeadersToLog:   extraHeaders,
 										AdditionalResponseHeadersToLog:  extraHeaders,
@@ -826,7 +826,7 @@ var _ = Describe("Plugin", func() {
 									GrpcService: &accessLogService.GrpcService{
 										LogName: logName,
 										ServiceRef: &accessLogService.GrpcService_StaticClusterName{
-											StaticClusterName: translatorutil.UpstreamToClusterName(usRef),
+											StaticClusterName: utils.ResourceRefToKey(usRef),
 										},
 										AdditionalRequestHeadersToLog:   extraHeaders,
 										AdditionalResponseHeadersToLog:  extraHeaders,
@@ -878,7 +878,7 @@ var _ = Describe("Plugin", func() {
 									GrpcService: &accessLogService.GrpcService{
 										LogName: logName,
 										ServiceRef: &accessLogService.GrpcService_StaticClusterName{
-											StaticClusterName: translatorutil.UpstreamToClusterName(usRef),
+											StaticClusterName: utils.ResourceRefToKey(usRef),
 										},
 										AdditionalRequestHeadersToLog:   extraHeaders,
 										AdditionalResponseHeadersToLog:  extraHeaders,
@@ -932,7 +932,7 @@ var _ = Describe("Plugin", func() {
 									GrpcService: &accessLogService.GrpcService{
 										LogName: logName,
 										ServiceRef: &accessLogService.GrpcService_StaticClusterName{
-											StaticClusterName: translatorutil.UpstreamToClusterName(usRef),
+											StaticClusterName: utils.ResourceRefToKey(usRef),
 										},
 										AdditionalRequestHeadersToLog:   extraHeaders,
 										AdditionalResponseHeadersToLog:  extraHeaders,
@@ -962,7 +962,7 @@ var _ = Describe("Plugin", func() {
 									GrpcService: &accessLogService.GrpcService{
 										LogName: logName,
 										ServiceRef: &accessLogService.GrpcService_StaticClusterName{
-											StaticClusterName: translatorutil.UpstreamToClusterName(usRef),
+											StaticClusterName: utils.ResourceRefToKey(usRef),
 										},
 										AdditionalRequestHeadersToLog:   extraHeaders,
 										AdditionalResponseHeadersToLog:  extraHeaders,

projects/gloo/pkg/plugins/aws/plugin.go

@@ -26,7 +26,6 @@ import (
 	"github.com/solo-io/gloo/projects/gloo/pkg/plugins"
 	"github.com/solo-io/gloo/projects/gloo/pkg/plugins/pluginutils"
 	"github.com/solo-io/gloo/projects/gloo/pkg/plugins/transformation"
-	"github.com/solo-io/gloo/projects/gloo/pkg/translator"
 	"github.com/solo-io/gloo/projects/gloo/pkg/upstreams"
 	"github.com/solo-io/gloo/projects/gloo/pkg/utils"
 	"github.com/solo-io/go-utils/contextutils"
@@ -99,7 +98,7 @@ func (p *Plugin) ProcessUpstream(params plugins.Params, in *v1.Upstream, out *en
 		return nil
 	}
 	// even if it failed, route should still be valid
-	p.recordedUpstreams[translator.UpstreamToClusterName(in.GetMetadata().Ref())] = upstreamSpec.Aws
+	p.recordedUpstreams[in.GetMetadata().Ref().Key()] = upstreamSpec.Aws
 
 	lambdaHostname := getLambdaHostname(upstreamSpec.Aws)
 
@@ -208,7 +207,7 @@ func (p *Plugin) ProcessRoute(params plugins.RouteParams, in *v1.Route, out *env
 			}
 
 			// validate that the upstream is one that we have previously recorded as an aws upstream
-			lambdaSpec, ok := p.recordedUpstreams[translator.UpstreamToClusterName(upstreamRef)]
+			lambdaSpec, ok := p.recordedUpstreams[upstreamRef.Key()]
 			if !ok {
 				if tryingNonExplicitAWSDest {
 					// skip the lambda plugin as the route was not explicitly set to be an aws route

projects/gloo/pkg/plugins/azure/plugin.go

@@ -17,7 +17,6 @@ import (
 	"github.com/solo-io/gloo/projects/gloo/pkg/plugins"
 	"github.com/solo-io/gloo/projects/gloo/pkg/plugins/pluginutils"
 	"github.com/solo-io/gloo/projects/gloo/pkg/plugins/transformation"
-	"github.com/solo-io/gloo/projects/gloo/pkg/translator"
 	"github.com/solo-io/gloo/projects/gloo/pkg/upstreams"
 	"github.com/solo-io/gloo/projects/gloo/pkg/utils"
 	"github.com/solo-io/go-utils/contextutils"
@@ -64,7 +63,7 @@ func (p *plugin) ProcessUpstream(params plugins.Params, in *v1.Upstream, out *en
 		return nil
 	}
 	azureUpstream := upstreamSpec.Azure
-	p.recordedUpstreams[translator.UpstreamToClusterName(in.GetMetadata().Ref())] = azureUpstream
+	p.recordedUpstreams[in.GetMetadata().Ref().Key()] = azureUpstream
 
 	// configure Envoy cluster routing info
 	out.ClusterDiscoveryType = &envoy_config_cluster_v3.Cluster_Type{
@@ -126,7 +125,7 @@ func (p *plugin) ProcessRoute(params plugins.RouteParams, in *v1.Route, out *env
 				contextutils.LoggerFrom(p.ctx).Error(err)
 				return nil, err
 			}
-			upstreamSpec, ok := p.recordedUpstreams[translator.UpstreamToClusterName(upstreamRef)]
+			upstreamSpec, ok := p.recordedUpstreams[upstreamRef.Key()]
 			if !ok {
 				// TODO(yuval-k): panic in debug
 				return nil, errors.Errorf("%v is not an Azure upstream", *upstreamRef)