Signed-off-by: Keerthan Ekbote <keerthan.ekbote@solo.io>
This commit is contained in:
Keerthan Ekbote
2021-04-30 09:50:18 -04:00
parent 8be3d82ae9
commit d8c8b90a95
2 changed files with 6 additions and 7 deletions
+4 -6
View File
@@ -19,6 +19,7 @@ package router
import (
"context"
"fmt"
corev1 "k8s.io/api/core/v1"
gatewayv1 "github.com/fluxcd/flagger/pkg/apis/gloo/gateway/v1"
@@ -62,7 +63,6 @@ func (gr *GlooRouter) Reconcile(canary *flaggerv1.Canary) error {
return fmt.Errorf("error creating flagger canary upstream: %w", err)
}
newSpec := gatewayv1.RouteTableSpec{
Routes: []gatewayv1.Route{
{
@@ -242,15 +242,15 @@ func (gr *GlooRouter) Finalize(_ *flaggerv1.Canary) error {
return nil
}
func (gr *GlooRouter) createFlaggerUpstream(canary *flaggerv1.Canary, upstreamName string, isCanary bool) error{
func (gr *GlooRouter) createFlaggerUpstream(canary *flaggerv1.Canary, upstreamName string, isCanary bool) error {
_, primaryName, canaryName := canary.GetServiceNames()
upstreamClient := gr.glooClient.GlooV1().Upstreams(canary.Namespace)
svcName := primaryName
if isCanary{
if isCanary {
svcName = canaryName
}
svc, err := gr.kubeClient.CoreV1().Services(canary.Namespace).Get(context.TODO(), svcName, metav1.GetOptions{})
if err != nil{
if err != nil {
return fmt.Errorf("service %s.%s get query error: %w", svcName, canary.Namespace, err)
}
_, err = upstreamClient.Get(context.TODO(), upstreamName, metav1.GetOptions{})
@@ -337,5 +337,3 @@ func getMethods(canary *flaggerv1.Canary) []string {
}
return methods
}
+2 -1
View File
@@ -19,9 +19,10 @@ package router
import (
"context"
"fmt"
gatewayv1 "github.com/fluxcd/flagger/pkg/apis/gloo/gateway/v1"
"testing"
gatewayv1 "github.com/fluxcd/flagger/pkg/apis/gloo/gateway/v1"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"