feat: allow user to gets list of his tenants

projectcapsule · Dec 11, 2023 · c383a39 · c383a39
1 parent fba4efd
commit c383a39
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 23 deletions.
diff --git a/internal/modules/tenants/get.go b/internal/modules/tenants/get.go
@@ -10,35 +10,31 @@ import (
 	capsulev1beta2 "github.com/clastix/capsule/api/v1beta2"
 	"github.com/go-logr/logr"
 	"github.com/gorilla/mux"
+	"github.com/projectcapsule/capsule-proxy/internal/modules"
+	"github.com/projectcapsule/capsule-proxy/internal/modules/errors"
+	"github.com/projectcapsule/capsule-proxy/internal/request"
+	"github.com/projectcapsule/capsule-proxy/internal/tenant"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-
-	"github.com/projectcapsule/capsule-proxy/internal/controllers"
-	"github.com/projectcapsule/capsule-proxy/internal/modules"
-	"github.com/projectcapsule/capsule-proxy/internal/modules/errors"
-	"github.com/projectcapsule/capsule-proxy/internal/request"
-	"github.com/projectcapsule/capsule-proxy/internal/tenant"
 )
 
 type get struct {
 	capsuleLabel string
 	client       client.Reader
 	log          logr.Logger
-	rbReflector  *controllers.RoleBindingReflector
 	gk           schema.GroupKind
 }
 
-func Get(roleBindingsReflector *controllers.RoleBindingReflector, client client.Reader) modules.Module {
+func Get(client client.Reader) modules.Module {
 	label, _ := capsulev1beta2.GetTypeLabel(&capsulev1beta2.Tenant{})
 
 	return &get{
 		capsuleLabel: label,
 		client:       client,
 		log:          ctrl.Log.WithName("tenant_get"),
-		rbReflector:  roleBindingsReflector,
 		gk: schema.GroupKind{
 			Group: corev1.GroupName,
 			Kind:  "tenants",

diff --git a/internal/modules/tenants/list.go b/internal/modules/tenants/list.go
@@ -7,29 +7,25 @@ import (
 	"net/http"
 
 	"github.com/go-logr/logr"
+	"github.com/projectcapsule/capsule-proxy/internal/modules"
+	"github.com/projectcapsule/capsule-proxy/internal/modules/errors"
+	"github.com/projectcapsule/capsule-proxy/internal/request"
+	"github.com/projectcapsule/capsule-proxy/internal/tenant"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/selection"
 	ctrl "sigs.k8s.io/controller-runtime"
-
-	"github.com/projectcapsule/capsule-proxy/internal/controllers"
-	"github.com/projectcapsule/capsule-proxy/internal/modules"
-	"github.com/projectcapsule/capsule-proxy/internal/modules/errors"
-	"github.com/projectcapsule/capsule-proxy/internal/request"
-	"github.com/projectcapsule/capsule-proxy/internal/tenant"
 )
 
 type list struct {
-	roleBindingsReflector *controllers.RoleBindingReflector
-	log                   logr.Logger
-	gk                    schema.GroupKind
+	log logr.Logger
+	gk  schema.GroupKind
 }
 
-func List(roleBindingsReflector *controllers.RoleBindingReflector) modules.Module {
+func List() modules.Module {
 	return &list{
-		roleBindingsReflector: roleBindingsReflector,
-		log:                   ctrl.Log.WithName("tenant_list"),
+		log: ctrl.Log.WithName("tenant_list"),
 		gk: schema.GroupKind{
 			Group: corev1.GroupName,
 			Kind:  "tenants",

diff --git a/internal/webserver/webserver.go b/internal/webserver/webserver.go
@@ -236,8 +236,8 @@ func (n *kubeFilter) registerModules(ctx context.Context, root *mux.Router) {
 		metric.Get(n.reader),
 		metric.List(n.reader),
 		pod.Get(n.reader),
-		tenants.List(n.roleBindingsReflector),
-		tenants.Get(n.roleBindingsReflector, n.reader),
+		tenants.List(),
+		tenants.Get(n.reader),
 	}
 	for _, i := range modList {
 		mod := i