From a9c96fa8884f313e3e46623a34bbf9834c2a9a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Carreira?= Date: Fri, 20 Nov 2020 10:34:10 +0000 Subject: [PATCH] update th usage of App Mesh types --- pkg/router/appmesh_v1beta2.go | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkg/router/appmesh_v1beta2.go b/pkg/router/appmesh_v1beta2.go index 4dd24ee5..e5248577 100644 --- a/pkg/router/appmesh_v1beta2.go +++ b/pkg/router/appmesh_v1beta2.go @@ -108,15 +108,13 @@ func (ar *AppMeshv1beta2Router) reconcileVirtualNode(canary *flaggerv1.Canary, n if b[:6] == "arn:aws" { bk = appmeshv1.Backend{ VirtualService: appmeshv1.VirtualServiceBackend{ - VirtualServiceRef: appmeshv1.VirtualServiceReference{ - ARN: b, - }, + VirtualServiceARN: &b, }, } } else { bk = appmeshv1.Backend{ VirtualService: appmeshv1.VirtualServiceBackend{ - VirtualServiceRef: appmeshv1.VirtualServiceReference{ + VirtualServiceRef: &appmeshv1.VirtualServiceReference{ Name: b, }, }, @@ -211,13 +209,13 @@ func (ar *AppMeshv1beta2Router) reconcileVirtualRouter(canary *flaggerv1.Canary, Action: appmeshv1.HTTPRouteAction{ WeightedTargets: []appmeshv1.WeightedTarget{ { - VirtualNodeRef: appmeshv1.VirtualNodeReference{ + VirtualNodeRef: &appmeshv1.VirtualNodeReference{ Name: canaryVirtualNode, }, Weight: canaryWeight, }, { - VirtualNodeRef: appmeshv1.VirtualNodeReference{ + VirtualNodeRef: &appmeshv1.VirtualNodeReference{ Name: primaryVirtualNode, }, Weight: 100 - canaryWeight, @@ -244,13 +242,13 @@ func (ar *AppMeshv1beta2Router) reconcileVirtualRouter(canary *flaggerv1.Canary, Action: appmeshv1.HTTPRouteAction{ WeightedTargets: []appmeshv1.WeightedTarget{ { - VirtualNodeRef: appmeshv1.VirtualNodeReference{ + VirtualNodeRef: &appmeshv1.VirtualNodeReference{ Name: canaryVirtualNode, }, Weight: canaryWeight, }, { - VirtualNodeRef: appmeshv1.VirtualNodeReference{ + VirtualNodeRef: &appmeshv1.VirtualNodeReference{ Name: primaryVirtualNode, }, Weight: 100 - canaryWeight, @@ -271,7 +269,7 @@ func (ar *AppMeshv1beta2Router) reconcileVirtualRouter(canary *flaggerv1.Canary, Action: appmeshv1.HTTPRouteAction{ WeightedTargets: []appmeshv1.WeightedTarget{ { - VirtualNodeRef: appmeshv1.VirtualNodeReference{ + VirtualNodeRef: &appmeshv1.VirtualNodeReference{ Name: primaryVirtualNode, }, Weight: 100, @@ -336,7 +334,7 @@ func (ar *AppMeshv1beta2Router) reconcileVirtualRouter(canary *flaggerv1.Canary, Spec: appmeshv1.VirtualServiceSpec{ Provider: &appmeshv1.VirtualServiceProvider{ VirtualRouter: &appmeshv1.VirtualRouterServiceProvider{ - VirtualRouterRef: appmeshv1.VirtualRouterReference{ + VirtualRouterRef: &appmeshv1.VirtualRouterReference{ Name: name, }, }, @@ -442,13 +440,13 @@ func (ar *AppMeshv1beta2Router) SetRoutes( vrClone.Spec.Routes[0].HTTPRoute.Action = appmeshv1.HTTPRouteAction{ WeightedTargets: []appmeshv1.WeightedTarget{ { - VirtualNodeRef: appmeshv1.VirtualNodeReference{ + VirtualNodeRef: &appmeshv1.VirtualNodeReference{ Name: canaryName, }, Weight: int64(canaryWeight), }, { - VirtualNodeRef: appmeshv1.VirtualNodeReference{ + VirtualNodeRef: &appmeshv1.VirtualNodeReference{ Name: primaryName, }, Weight: int64(primaryWeight),