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

update th usage of App Mesh types

Browse Source
This commit is contained in:
João Carreira
2020-11-20 10:34:10 +00:00
parent 7ab9061899
commit a9c96fa888
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/router/appmesh_v1beta2.go
+10 -12
View File
@@ -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),