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

feat(gateway): opt controller #318

Merged
merged 8 commits into from
Sep 16, 2022
Merged

feat(gateway): opt controller #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
22870fa
feat(gateway): impl gateway crd and opt route&domain crd
skyoct Sep 8, 2022
8ee4cad
feat(gateway):update manifests
skyoct Sep 8, 2022
d2170f6
feat(gateway): update app route
skyoct Sep 12, 2022
89134fb
feat(gateway): update bucket route
skyoct Sep 13, 2022
a40dfc7
feat(gateway): opt controller
skyoct Sep 14, 2022
9b3fa49
feat(gateway): opt controller & remove redundant code
skyoct Sep 15, 2022
3a09b4a
Merge remote-tracking branch 'upstream/next' into new_next
skyoct Sep 15, 2022
9bd6d07
feat(gateway): remove old code
skyoct Sep 15, 2022
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
129 changes: 42 additions & 87 deletions controllers/gateway/controllers/gateway_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ import (
"context"
"errors"
ossv1 "github.com/labring/laf/controllers/oss/api/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/util/retry"
"laf/pkg/util"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
Expand Down Expand Up @@ -59,50 +62,15 @@ func (r *GatewayReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ct
if err := r.Get(ctx, req.NamespacedName, gateway); err != nil {
return ctrl.Result{}, client.IgnoreNotFound(err)
}
if !gateway.DeletionTimestamp.IsZero() {
return r.delete(ctx, gateway)
if gateway.DeletionTimestamp.IsZero() {
return r.apply(ctx, gateway)
}

return r.apply(ctx, gateway)
}

func (r *GatewayReconciler) delete(ctx context.Context, gateway *gatewayv1.Gateway) (ctrl.Result, error) {
_log := log.FromContext(ctx)

// delete app route
if _, err := r.deleteApp(ctx, gateway); err != nil {
return ctrl.Result{}, err
}

// delete bucket route
if _, err := r.deleteBuckets(ctx, gateway, nil); err != nil {
return ctrl.Result{}, err
}

// remove finalizer
gateway.Finalizers = util.RemoveString(gateway.Finalizers, gatewayFinalizer)
if err := r.Update(ctx, gateway); err != nil {
return ctrl.Result{}, err
}

_log.Info("delete gateway: v success", "v", gateway.Name)

return ctrl.Result{}, nil
}

func (r *GatewayReconciler) apply(ctx context.Context, gateway *gatewayv1.Gateway) (ctrl.Result, error) {
_log := log.FromContext(ctx)

_log.Info("apply gateway", "v", gateway.Name)

// add finalizer
if !util.ContainsString(gateway.Finalizers, gatewayFinalizer) {
gateway.Finalizers = append(gateway.Finalizers, gatewayFinalizer)
if err := r.Update(ctx, gateway); err != nil {
return ctrl.Result{}, err
}
}

if gateway.Status.AppRoute == nil {
result, err := r.applyApp(ctx, gateway)
if err != nil {
Expand All @@ -116,6 +84,8 @@ func (r *GatewayReconciler) apply(ctx context.Context, gateway *gatewayv1.Gatewa
return result, err
}

_log.Info("apply gateway: name success", "name", gateway.Name)

return ctrl.Result{}, nil
}

Expand Down Expand Up @@ -159,44 +129,22 @@ func (r *GatewayReconciler) applyApp(ctx context.Context, gateway *gatewayv1.Gat
},
},
}
if err := r.Create(ctx, appRoute); err != nil {
if !apierrors.IsAlreadyExists(err) {
return ctrl.Result{}, nil

if _, err := controllerutil.CreateOrUpdate(ctx, r.Client, appRoute, func() error {
if err := controllerutil.SetControllerReference(gateway, appRoute, r.Scheme); err != nil {
return err
}
return nil
}); err != nil {
return ctrl.Result{}, err
}

// update gateway status
gateway.Status.AppRoute = routeStatus
if err := r.Status().Update(ctx, gateway); err != nil {
return ctrl.Result{}, err
}
return ctrl.Result{}, nil
}

// deleteApp delete app
func (r *GatewayReconciler) deleteApp(ctx context.Context, gateway *gatewayv1.Gateway) (ctrl.Result, error) {
_log := log.FromContext(ctx)

_log.Info("delete app route", "v", gateway.Name)

// delete app route
appRoute := &gatewayv1.Route{}

if err := r.Get(ctx, client.ObjectKey{Name: "app", Namespace: gateway.Spec.AppId}, appRoute); err != nil {
if apierrors.IsNotFound(err) {
return ctrl.Result{}, nil
}
if err = r.updateStatus(ctx, types.NamespacedName{Name: gateway.Name, Namespace: gateway.Namespace}, gateway.Status.DeepCopy()); err != nil {
return ctrl.Result{}, err
}

if err := r.Delete(ctx, appRoute); err != nil {
if apierrors.IsNotFound(err) {
return ctrl.Result{}, nil
}
return ctrl.Result{}, err
}

return ctrl.Result{}, nil
}

Expand Down Expand Up @@ -234,6 +182,7 @@ func (r *GatewayReconciler) applyBucket(ctx context.Context, gateway *gatewayv1.
return ctrl.Result{}, nil
}

// addBuckets add buckets
func (r *GatewayReconciler) addBuckets(ctx context.Context, gateway *gatewayv1.Gateway, buckets []string) (ctrl.Result, error) {
_log := log.FromContext(ctx)

Expand Down Expand Up @@ -301,46 +250,35 @@ func (r *GatewayReconciler) addBuckets(ctx context.Context, gateway *gatewayv1.G
PassHost: bucketName + "." + user.Status.Endpoint,
},
}
if err := r.Create(ctx, bucketRoute); err != nil {
if apierrors.IsAlreadyExists(err) {
continue

if _, err := controllerutil.CreateOrUpdate(ctx, r.Client, bucketRoute, func() error {
if err := controllerutil.SetControllerReference(gateway, bucketRoute, r.Scheme); err != nil {
return err
}
return nil
}); err != nil {
return ctrl.Result{}, err
}

gateway.Status.BucketRoutes[bucketName] = routeStatus
// update gateway status
if err := r.Status().Update(ctx, gateway); err != nil {

if err = r.updateStatus(ctx, types.NamespacedName{Name: gateway.Name, Namespace: gateway.Namespace}, gateway.Status.DeepCopy()); err != nil {
return ctrl.Result{}, err
}
}

return ctrl.Result{}, nil
}

// deleteBucket delete bucket
// deleteBuckets delete buckets
func (r *GatewayReconciler) deleteBuckets(ctx context.Context, gateway *gatewayv1.Gateway, buckets []string) (ctrl.Result, error) {
_ = log.FromContext(ctx)

// if buckets is nil, add all buckets
if buckets == nil {
buckets = make([]string, 0)
for bucketName := range gateway.Status.BucketRoutes {
buckets = append(buckets, bucketName)
}
}

// find deleted bucket, remote route and finalizer
for _, bucketName := range buckets {
// delete route
route := &gatewayv1.Route{}

// 删除名称为test的route
err := r.Get(ctx, client.ObjectKey{Namespace: gateway.Spec.AppId, Name: "bucket-" + bucketName}, route)
if err != nil {

}

if err := r.Get(ctx, client.ObjectKey{Namespace: gateway.Spec.AppId, Name: "bucket-" + bucketName}, route); err != nil {
if apierrors.IsNotFound(err) {
continue
Expand All @@ -357,7 +295,7 @@ func (r *GatewayReconciler) deleteBuckets(ctx context.Context, gateway *gatewayv

// delete bucket route
delete(gateway.Status.BucketRoutes, bucketName)
if err := r.Status().Update(ctx, gateway); err != nil {
if err := r.updateStatus(ctx, types.NamespacedName{Name: gateway.Name, Namespace: gateway.Namespace}, gateway.Status.DeepCopy()); err != nil {
return ctrl.Result{}, err
}
}
Expand Down Expand Up @@ -388,6 +326,23 @@ func (r *GatewayReconciler) selectDomain(ctx context.Context, backendType gatewa
return nil, nil
}

func (r *GatewayReconciler) updateStatus(ctx context.Context, nn types.NamespacedName, status *gatewayv1.GatewayStatus) error {
if err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
original := &gatewayv1.Gateway{}
if err := r.Get(ctx, nn, original); err != nil {
return err
}
original.Status = *status
if err := r.Client.Status().Update(ctx, original); err != nil {
return err
}
return nil
}); err != nil {
return err
}
return nil
}

// SetupWithManager sets up the controller with the Manager.
func (r *GatewayReconciler) SetupWithManager(mgr ctrl.Manager) error {
return ctrl.NewControllerManagedBy(mgr).
Expand Down
36 changes: 27 additions & 9 deletions controllers/gateway/controllers/route_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import (
"context"
"github.com/labring/laf/controllers/gateway/apisix"
"k8s.io/apimachinery/pkg/types"
"laf/pkg/util"
"k8s.io/client-go/util/retry"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
"strconv"
"time"

Expand Down Expand Up @@ -80,12 +81,10 @@ func (r *RouteReconciler) applyRoute(ctx context.Context, route *gatewayv1.Route
_log := log.FromContext(ctx)

// add finalizer if not present
if !util.ContainsString(route.ObjectMeta.Finalizers, routeFinalizer) {
route.ObjectMeta.Finalizers = append(route.ObjectMeta.Finalizers, routeFinalizer)
if controllerutil.AddFinalizer(route, routeFinalizer) {
if err := r.Update(ctx, route); err != nil {
return ctrl.Result{}, err
}
_log.Info("add finalizer to route")
}

// get route id
Expand Down Expand Up @@ -145,7 +144,7 @@ func (r *RouteReconciler) applyRoute(ctx context.Context, route *gatewayv1.Route
// update route status
if route.Status.Domain == "" {
route.Status.Domain = route.Spec.Domain
if err := r.Status().Update(ctx, route); err != nil {
if err := r.updateStatus(ctx, types.NamespacedName{Namespace: route.Namespace, Name: route.Name}, route.Status.DeepCopy()); err != nil {
return ctrl.Result{}, err
}
}
Expand All @@ -160,14 +159,16 @@ func (r *RouteReconciler) deleteRoute(ctx context.Context, route *gatewayv1.Rout
routeId := getRouteId(route)
err := cluster.Route.Delete(routeId)
if err != nil {
return ctrl.Result{RequeueAfter: time.Minute * 15}, err
return ctrl.Result{RequeueAfter: time.Minute * 1}, err
}

// remove the finalizer
route.ObjectMeta.Finalizers = util.RemoveString(route.ObjectMeta.Finalizers, routeFinalizer)
if err := r.Update(ctx, route); err != nil {
return ctrl.Result{}, err
if controllerutil.RemoveFinalizer(route, routeFinalizer) {
if err := r.Update(ctx, route); err != nil {
return ctrl.Result{}, err
}
}

_log.Info("route deleted: " + routeId)
return ctrl.Result{}, nil
}
Expand All @@ -182,6 +183,23 @@ func (r *RouteReconciler) getGatewayCluster(ctx context.Context, route *gatewayv
return cluster, nil
}

func (r *RouteReconciler) updateStatus(ctx context.Context, nn types.NamespacedName, status *gatewayv1.RouteStatus) error {
if err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
original := &gatewayv1.Route{}
if err := r.Get(ctx, nn, original); err != nil {
return err
}
original.Status = *status
if err := r.Client.Status().Update(ctx, original); err != nil {
return err
}
return nil
}); err != nil {
return err
}
return nil
}

func getRouteId(route *gatewayv1.Route) string {
return route.Namespace + "-" + route.Name
}
Expand Down