diff --git a/controllers/database/controllers/database_controller.go b/controllers/database/controllers/database_controller.go index 235fdb5371..1b268a1661 100644 --- a/controllers/database/controllers/database_controller.go +++ b/controllers/database/controllers/database_controller.go @@ -22,6 +22,7 @@ import ( databasev1 "github.com/labring/laf/controllers/database/api/v1" "github.com/labring/laf/controllers/database/dbm" "k8s.io/apimachinery/pkg/runtime" + "laf/pkg/util" "net/url" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" @@ -70,7 +71,7 @@ func (r *DatabaseReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c func (r *DatabaseReconciler) apply(ctx context.Context, database *databasev1.Database) (ctrl.Result, error) { // add the finalizer if database.ObjectMeta.DeletionTimestamp.IsZero() { - if !containsString(database.ObjectMeta.Finalizers, "database.laf.dev") { + if !util.ContainsString(database.ObjectMeta.Finalizers, "database.laf.dev") { database.ObjectMeta.Finalizers = append(database.ObjectMeta.Finalizers, "database.laf.dev") if err := r.Update(ctx, database); err != nil { return ctrl.Result{}, err @@ -249,13 +250,3 @@ func (r *DatabaseReconciler) SetupWithManager(mgr ctrl.Manager) error { For(&databasev1.Database{}). Complete(r) } - -// TODO: move it to pkg/util -func containsString(finalizers []string, s string) bool { - for _, f := range finalizers { - if f == s { - return true - } - } - return false -} diff --git a/go.work b/go.work new file mode 100644 index 0000000000..d2489fbf30 --- /dev/null +++ b/go.work @@ -0,0 +1,9 @@ +go 1.18 + +use ( + . + ./controllers/application + ./controllers/database + ./controllers/oss + ./controllers/gateway +) \ No newline at end of file diff --git a/go.work.sum b/go.work.sum new file mode 100644 index 0000000000..901cdf599d --- /dev/null +++ b/go.work.sum @@ -0,0 +1 @@ +github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= diff --git a/pkg/util/string.go b/pkg/util/string.go new file mode 100644 index 0000000000..1672691c23 --- /dev/null +++ b/pkg/util/string.go @@ -0,0 +1,10 @@ +package util + +func ContainsString(finalizers []string, s string) bool { + for _, f := range finalizers { + if f == s { + return true + } + } + return false +}