Skip to content

Enhance RouteTable CRD sync routes synchronisation #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 20, 2024
Merged

Enhance RouteTable CRD sync routes synchronisation #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apis/v1alpha1/ack-generate-metadata.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ack_generate_info:
build_date: "2024-06-04T06:39:17Z"
build_date: "2024-06-19T06:55:08Z"
build_hash: 14cef51778d471698018b6c38b604181a6948248
go_version: go1.22.3
go_version: go1.22.4
version: v0.34.0
api_directory_checksum: 7fd395ceb7d5d8e35906991c7348d3498f384741
api_version: v1alpha1
Expand Down
68 changes: 38 additions & 30 deletions pkg/resource/route_table/hooks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,21 @@ func (rm *resourceManager) syncRoutes(
) (err error) {
rlog := ackrtlog.FromContext(ctx)
exit := rlog.Trace("rm.syncRoutes")
defer exit(err)
defer func(err error) { exit(err) }(err)
toAdd := []*svcapitypes.CreateRouteInput{}
toDelete := []*svcapitypes.CreateRouteInput{}

if latest != nil {
latest.ko.Spec.Routes = rm.excludeAwsRoute(latest.ko.Spec.Routes)
latest.ko.Spec.Routes, err = rm.excludeAWSRoute(latest.ko.Spec.Routes)
if err != nil {
return err
}
}
if desired != nil {
desired.ko.Spec.Routes = rm.excludeAwsRoute(desired.ko.Spec.Routes)
desired.ko.Spec.Routes, err = rm.excludeAWSRoute(desired.ko.Spec.Routes)
if err != nil {
return err
}
}

for _, desiredRoute := range desired.ko.Spec.Routes {
Expand Down Expand Up @@ -85,18 +91,18 @@ func (rm *resourceManager) syncRoutes(
}
}

for _, route := range toAdd {
rlog.Debug("adding route to route table")
if err = rm.createRoute(ctx, desired, *route); err != nil {
return err
}
}
for _, route := range toDelete {
rlog.Debug("deleting route from route table")
if err = rm.deleteRoute(ctx, latest, *route); err != nil {
return err
}
}
for _, route := range toAdd {
rlog.Debug("adding route to route table")
if err = rm.createRoute(ctx, desired, *route); err != nil {
return err
}
}

return nil
}
Expand Down Expand Up @@ -162,7 +168,7 @@ func (rm *resourceManager) createRoute(
) (err error) {
rlog := ackrtlog.FromContext(ctx)
exit := rlog.Trace("rm.createRoute")
defer exit(err)
defer func(err error) { exit(err) }(err)

input := rm.newCreateRouteInput(c)
// Routes should only be configurable for the
Expand All @@ -180,7 +186,7 @@ func (rm *resourceManager) deleteRoute(
) (err error) {
rlog := ackrtlog.FromContext(ctx)
exit := rlog.Trace("rm.deleteRoute")
defer exit(err)
defer func(err error) { exit(err) }(err)

input := rm.newDeleteRouteInput(c)
// Routes should only be configurable for the
Expand All @@ -199,7 +205,7 @@ func (rm *resourceManager) customUpdateRouteTable(
) (updated *resource, err error) {
rlog := ackrtlog.FromContext(ctx)
exit := rlog.Trace("rm.customUpdateRouteTable")
defer exit(err)
defer func(err error) { exit(err) }(err)

// Default `updated` to `desired` because it is likely
// EC2 `modify` APIs do NOT return output, only errors.
Expand All @@ -208,6 +214,16 @@ func (rm *resourceManager) customUpdateRouteTable(
// (now updated.Spec) reflects the latest resource state.
updated = rm.concreteResource(desired.DeepCopy())

if delta.DifferentAt("Spec.Tags") {
if err := tags.Sync(
ctx, rm.sdkapi, rm.metrics,
*latest.ko.Status.RouteTableID,
desired.ko.Spec.Tags, latest.ko.Spec.Tags,
); err != nil {
return nil, err
}
}

if delta.DifferentAt("Spec.Routes") {
if err := rm.syncRoutes(ctx, desired, latest); err != nil {
return nil, err
Expand All @@ -220,15 +236,6 @@ func (rm *resourceManager) customUpdateRouteTable(
}
}

if delta.DifferentAt("Spec.Tags") {
if err := tags.Sync(
ctx, rm.sdkapi, rm.metrics, *latest.ko.Status.RouteTableID,
desired.ko.Spec.Tags, latest.ko.Spec.Tags,
); err != nil {
return nil, err
}
}

return updated, nil
}

Expand Down Expand Up @@ -287,9 +294,9 @@ func removeLocalRoute(
return ret
}

func (rm *resourceManager) excludeAwsRoute(
func (rm *resourceManager) excludeAWSRoute(
routes []*svcapitypes.CreateRouteInput,
) (ret []*svcapitypes.CreateRouteInput) {
) (ret []*svcapitypes.CreateRouteInput, err error) {
ret = make([]*svcapitypes.CreateRouteInput, 0)
var prefixListIds []*string

Expand All @@ -300,20 +307,21 @@ func (rm *resourceManager) excludeAwsRoute(
return route.DestinationPrefixListID != nil
})

prefix_list_routes := lo.Filter(routes, func(route *svcapitypes.CreateRouteInput, index int) bool {
prefixListRoutes := lo.Filter(routes, func(route *svcapitypes.CreateRouteInput, index int) bool {
return route.DestinationPrefixListID != nil
})

prefixListIds = lo.Map(prefix_list_routes, func(route *svcapitypes.CreateRouteInput, _ int) *string {
prefixListIds = lo.Map(prefixListRoutes, func(route *svcapitypes.CreateRouteInput, _ int) *string {
return route.DestinationPrefixListID

})

var resp *svcsdk.DescribeManagedPrefixListsOutput
input := &svcsdk.DescribeManagedPrefixListsInput{}
input.PrefixListIds = prefixListIds
resp, _ = rm.sdkapi.DescribeManagedPrefixLists(input)
resp, err := rm.sdkapi.DescribeManagedPrefixLists(input)
rm.metrics.RecordAPICall("READ_MANY", "DescribeManagedPrefixLists", nil)
if err != nil {
return ret, nil
}

m := lo.FilterMap(resp.PrefixLists, func(mpl *svcsdk.ManagedPrefixList, _ int) (string, bool) {
if strings.EqualFold(*mpl.OwnerId, "AWS") {
Expand All @@ -322,7 +330,7 @@ func (rm *resourceManager) excludeAwsRoute(
return "", false
})

filtered_routes := lo.FilterMap(prefix_list_routes, func(route *svcapitypes.CreateRouteInput, _ int) (*svcapitypes.CreateRouteInput, bool) {
filtered_routes := lo.FilterMap(prefixListRoutes, func(route *svcapitypes.CreateRouteInput, _ int) (*svcapitypes.CreateRouteInput, bool) {
found := lo.IndexOf(m, *route.DestinationPrefixListID)
if found == -1 {
return route, true
Expand All @@ -331,7 +339,7 @@ func (rm *resourceManager) excludeAwsRoute(
})
ret = append(ret, filtered_routes...)

return ret
return ret, nil
}

// updateTagSpecificationsInCreateRequest adds
Expand Down
5 changes: 3 additions & 2 deletions pkg/resource/route_table/sdk.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions templates/hooks/route_table/sdk_create_post_set_output.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
if len(desired.ko.Spec.Routes) > 0 {
//desired routes are overwritten by RouteTable's default route
ko.Spec.Routes = append(ko.Spec.Routes, desired.ko.Spec.Routes...)
if err := rm.createRoutes(ctx, &resource{ko}); err != nil {
copy := ko.DeepCopy()
if err := rm.createRoutes(ctx, &resource{copy}); err != nil {
return nil, err
}
}
Expand All @@ -17,4 +18,4 @@
// if desired tags and response tags are equal,
// then assign desired tags to maintain tag order
ko.Spec.Tags = desired.ko.Spec.Tags
}
}
3 changes: 1 addition & 2 deletions templates/hooks/route_table/sdk_read_many_post_set_output.go.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@
// if resource's initial tags and response tags are equal,
// then assign resource's tags to maintain tag order
ko.Spec.Tags = r.ko.Spec.Tags
}

}