diff --git a/pkg/router/gloo.go b/pkg/router/gloo.go index 3ad19ae1..49536d6b 100644 --- a/pkg/router/gloo.go +++ b/pkg/router/gloo.go @@ -166,7 +166,7 @@ func (gr *GlooRouter) GetRoutes(canary *flaggerv1.Canary) ( err error, ) { apexName := canary.Spec.TargetRef.Name - primaryName := fmt.Sprintf("%s-%s-primary-%v", canary.Namespace, canary.Spec.TargetRef.Name, canary.Spec.Service.Port) + primaryName := fmt.Sprintf("%s-%s-primaryupstream-%v", canary.Namespace, canary.Spec.TargetRef.Name, canary.Spec.Service.Port) routeTable, err := gr.glooClient.GatewayV1().RouteTables(canary.Namespace).Get(context.TODO(), apexName, metav1.GetOptions{}) if err != nil { diff --git a/pkg/router/gloo_test.go b/pkg/router/gloo_test.go index c2e045f5..264aec6a 100644 --- a/pkg/router/gloo_test.go +++ b/pkg/router/gloo_test.go @@ -19,10 +19,9 @@ package router import ( "context" "fmt" + gatewayv1 "github.com/fluxcd/flagger/pkg/apis/gloo/gateway/v1" "testing" - "github.com/fluxcd/flagger/pkg/apis/gloo" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -94,10 +93,10 @@ func TestGlooRouter_SetRoutes(t *testing.T) { rt, err := router.glooClient.GatewayV1().RouteTables("default").Get(context.TODO(), "podinfo", metav1.GetOptions{}) require.NoError(t, err) - var pRoute gloo.WeightedDestination - var cRoute gloo.WeightedDestination - canaryName := fmt.Sprintf("%s-%s-canary-%v", mocks.canary.Namespace, mocks.canary.Spec.TargetRef.Name, mocks.canary.Spec.Service.Port) - primaryName := fmt.Sprintf("%s-%s-primary-%v", mocks.canary.Namespace, mocks.canary.Spec.TargetRef.Name, mocks.canary.Spec.Service.Port) + var pRoute gatewayv1.WeightedDestination + var cRoute gatewayv1.WeightedDestination + canaryName := fmt.Sprintf("%s-%s-canaryupstream-%v", mocks.canary.Namespace, mocks.canary.Spec.TargetRef.Name, mocks.canary.Spec.Service.Port) + primaryName := fmt.Sprintf("%s-%s-primaryupstream-%v", mocks.canary.Namespace, mocks.canary.Spec.TargetRef.Name, mocks.canary.Spec.Service.Port) for _, dest := range rt.Spec.Routes[0].Action.Destination.Destinations { if dest.Destination.Upstream.Name == primaryName {