Skip to content
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

Initialize route backends after module updates #243

Merged
merged 18 commits into from
Jun 12, 2023
+90 −30
Merged

Initialize route backends after module updates #243

Changes from 4 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8ba1716
Update edge controller to initialize route backends after module updates
CarlAmko May 31, 2023
b2d6c58
Simplify http edge routes var
CarlAmko May 31, 2023
bb13bb6
Merge branch 'main' into carl/208_fail-closed
CarlAmko May 31, 2023
cb0ca98
lint
CarlAmko May 31, 2023
e7993a9
update log messages/comments
CarlAmko Jun 2, 2023
fc47ffd
update comments
CarlAmko Jun 2, 2023
e193b47
spacing
CarlAmko Jun 2, 2023
cf22df6
more wording
CarlAmko Jun 2, 2023
bacaf31
more wording
CarlAmko Jun 2, 2023
9d6bc65
No longer remove backend from existing routes; now raises new config …
CarlAmko Jun 6, 2023
cba91d6
wrong ID when creating new route
CarlAmko Jun 6, 2023
b366e8d
undo README changes
CarlAmko Jun 7, 2023
0b96678
PR comments
CarlAmko Jun 7, 2023
f1f432a
Only ignore 400 HTTP status codes as unretryable
CarlAmko Jun 7, 2023
c4886f6
Add lib function to check for retryable errors
CarlAmko Jun 7, 2023
1f8d735
Better reconciliaton error checking
CarlAmko Jun 7, 2023
2ad0ddc
Better error casting
CarlAmko Jun 8, 2023
7b8ca27
Refactor invalid config error struct to look more like native error
CarlAmko Jun 8, 2023
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
60 changes: 39 additions & 21 deletions internal/controllers/httpsedge_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,12 +189,10 @@ func (r *HTTPSEdgeReconciler) reconcileRoutes(ctx context.Context, edge *ingress
secretResolver: secretResolver{r.Client},
}

edgeRoutes := r.NgrokClientset.HTTPSEdgeRoutes()

// TODO: clean this up. This is way too much nesting
for i, routeSpec := range edge.Spec.Routes {
backend, err := tunnelGroupReconciler.findOrCreate(ctx, routeSpec.Backend)
if err != nil {
return err
}

if routeSpec.IPRestriction != nil {
if err := routeModuleUpdater.ipPolicyResolver.validateIPPolicyNames(ctx, edge.Namespace, routeSpec.IPRestriction.IPPolicies); err != nil {
Expand All @@ -210,50 +208,70 @@ func (r *HTTPSEdgeReconciler) reconcileRoutes(ctx context.Context, edge *ingress
match := r.getMatchingRouteFromEdgeStatus(edge, routeSpec)
var route *ngrok.HTTPSEdgeRoute
if match == nil {
r.Log.Info("Creating new route", "edgeID", edge.Status.ID, "match", routeSpec.Match, "matchType", routeSpec.MatchType, "backendID", backend.ID)
r.Log.Info("Creating new route", "edgeID", edge.Status.ID, "match", routeSpec.Match, "matchType", routeSpec.MatchType)
// This is a new route, so we need to create it
req := &ngrok.HTTPSEdgeRouteCreate{
EdgeID: edge.Status.ID,
Match: routeSpec.Match,
MatchType: routeSpec.MatchType,
Backend: &ngrok.EndpointBackendMutate{
BackendID: backend.ID,
},
}
route, err = r.NgrokClientset.HTTPSEdgeRoutes().Create(ctx, req)
route, err = edgeRoutes.Create(ctx, req)
} else {
r.Log.Info("Updating route", "edgeID", edge.Status.ID, "match", routeSpec.Match, "matchType", routeSpec.MatchType, "backendID", backend.ID)
// This is an existing route, so we need to update it
// Otherwise, update the current route to disable its backend
req := &ngrok.HTTPSEdgeRouteUpdate{
EdgeID: edge.Status.ID,
ID: match.ID,
Match: routeSpec.Match,
MatchType: routeSpec.MatchType,
Backend: &ngrok.EndpointBackendMutate{
BackendID: backend.ID,
},
}
route, err = r.NgrokClientset.HTTPSEdgeRoutes().Update(ctx, req)
route, err = edgeRoutes.Update(ctx, req)
}
if err != nil {
return err
}

// Update route status, sans backend
routeStatuses[i] = ingressv1alpha1.HTTPSEdgeRouteStatus{
ID: route.ID,
URI: route.URI,
Match: route.Match,
MatchType: route.MatchType,
}

// Attempt to apply module updates for a given route
r.Log.Info("Evaluating route module updates", "edgeID", edge.Status.ID, "match", routeSpec.Match, "matchType", routeSpec.MatchType)
if err := routeModuleUpdater.updateModulesForRoute(ctx, route, &routeSpec); err != nil {
r.Recorder.Event(edge, v1.EventTypeWarning, "RouteModuleUpdateFailed", err.Error())
return err
}

// Route modules successfully updated, so now we can update the route with the specified backend
backend, err := tunnelGroupReconciler.findOrCreate(ctx, routeSpec.Backend)
if err != nil {
return err
}
r.Log.Info("Updating route backend", "edgeID", edge.Status.ID, "match", routeSpec.Match, "matchType", routeSpec.MatchType, "backendID", backend.ID)

req := &ngrok.HTTPSEdgeRouteUpdate{
EdgeID: edge.Status.ID,
ID: match.ID,
Match: routeSpec.Match,
MatchType: routeSpec.MatchType,
Backend: &ngrok.EndpointBackendMutate{
BackendID: backend.ID,
},
}
route, err = edgeRoutes.Update(ctx, req)
if err != nil {
return err
}

// Update route status with backend ID
if route.Backend != nil {
routeStatuses[i].Backend = ingressv1alpha1.TunnelGroupBackendStatus{
ID: route.Backend.Backend.ID,
}
}

// Update all route modules for a given route
if err := routeModuleUpdater.updateModulesForRoute(ctx, route, &routeSpec); err != nil {
return err
}
}

// Delete any routes that are no longer in the spec
Expand All @@ -267,7 +285,7 @@ func (r *HTTPSEdgeReconciler) reconcileRoutes(ctx context.Context, edge *ingress
}
if !found {
r.Log.Info("Deleting route", "edgeID", edge.Status.ID, "routeID", remoteRoute.ID)
if err := r.NgrokClientset.HTTPSEdgeRoutes().Delete(ctx, &ngrok.EdgeRouteItem{EdgeID: edge.Status.ID, ID: remoteRoute.ID}); err != nil {
if err := edgeRoutes.Delete(ctx, &ngrok.EdgeRouteItem{EdgeID: edge.Status.ID, ID: remoteRoute.ID}); err != nil {
return err
}
}
Expand Down