github/flagger
1
0
Fork 0
mirror of https://github.com/fluxcd/flagger.git synced 2026-04-15 06:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

changed upstream names in tests

Browse Source 
Signed-off-by: Keerthan Ekbote <keerthan.ekbote@solo.io>
This commit is contained in:
Keerthan Ekbote
2021-04-29 12:19:52 -04:00
parent 2935fad54d
commit 51936bdc89
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/router/gloo.go
+1 -1
View File
@@ -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 {
pkg/router/gloo_test.go
+5 -6
View File
@@ -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 {