migrate management/auth from norman to wrangler (rancher#47954)

* refact: move from norman to wrangler Signed-off-by: Alessio Greggi <[email protected]>
HarrisonWAffel · Nov 12, 2024 · a9ec025 · a9ec025
1 parent 186958f
commit a9ec025
Show file tree

Hide file tree

Showing 7 changed files with 325 additions and 308 deletions.
diff --git a/pkg/auth/cleanup/service_test.go b/pkg/auth/cleanup/service_test.go
@@ -292,7 +292,6 @@ func newMockCleanupService(t *testing.T,
 
 func getSecretControllerMock(ctrl *gomock.Controller, store map[string]*corev1.Secret) wcorev1.SecretController {
 	secretController := wranglerfake.NewMockControllerInterface[*corev1.Secret, *corev1.SecretList](ctrl)
-
 	secretController.EXPECT().Create(gomock.Any()).DoAndReturn(func(secret *corev1.Secret) (*corev1.Secret, error) {
 		if secret.Name == "" {
 			uniqueIdentifier := md5.Sum([]byte(time.Now().String()))

diff --git a/pkg/controllers/management/auth/legacy_grb_cleaner.go b/pkg/controllers/management/auth/legacy_grb_cleaner.go
@@ -31,7 +31,7 @@ func (p *grbCleaner) sync(key string, obj *v3.GlobalRoleBinding) (runtime.Object
 	}
 
 	cleanedObj := gbrCleanUp(obj)
-	return p.mgmt.Management.GlobalRoleBindings("").Update(cleanedObj)
+	return p.mgmt.Wrangler.Mgmt.GlobalRoleBinding().Update(cleanedObj)
 }
 
 // gbrCleanUp returns a clean GlobalRoleBinding based on filters specified within the function

diff --git a/pkg/controllers/management/auth/legacy_rt_cleaner.go b/pkg/controllers/management/auth/legacy_rt_cleaner.go
@@ -2,25 +2,26 @@ package auth
 
 import (
 	"github.com/rancher/rancher/pkg/api/norman/store/roletemplate"
-	v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
+	wv3 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3"
+	v3 "github.com/rancher/rancher/pkg/generated/controllers/management.cattle.io/v3"
 	"github.com/rancher/rancher/pkg/types/config"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
 type rtCleaner struct {
-	clusterLister v3.ClusterLister
-	mgmt          *config.ManagementContext
+	roleTemplates v3.RoleTemplateController
+	clusterLister v3.ClusterController
 }
 
 func newLegacyRTCleaner(mgmt *config.ManagementContext) *rtCleaner {
 	return &rtCleaner{
-		mgmt:          mgmt,
-		clusterLister: mgmt.Management.Clusters("").Controller().Lister(),
+		roleTemplates: mgmt.Wrangler.Mgmt.RoleTemplate(),
+		clusterLister: mgmt.Wrangler.Mgmt.Cluster(),
 	}
 }
 
 // sync cleans up all roleTemplates to drop cluster-scoped lifecycle handler finalizers
-func (p *rtCleaner) sync(key string, obj *v3.RoleTemplate) (runtime.Object, error) {
+func (p *rtCleaner) sync(key string, obj *wv3.RoleTemplate) (runtime.Object, error) {
 	if key == "" || obj == nil {
 		return nil, nil
 	}
@@ -29,11 +30,11 @@ func (p *rtCleaner) sync(key string, obj *v3.RoleTemplate) (runtime.Object, erro
 	}
 
 	cleanedObj := rtCleanUp(obj)
-	return p.mgmt.Management.RoleTemplates("").Update(cleanedObj)
+	return p.roleTemplates.Update(cleanedObj)
 }
 
 // rtCleanUp returns a clean RoleTemplate based on filters specified within the function
-func rtCleanUp(obj *v3.RoleTemplate) *v3.RoleTemplate {
+func rtCleanUp(obj *wv3.RoleTemplate) *wv3.RoleTemplate {
 	obj.SetFinalizers(cleanFinalizers(obj.GetFinalizers(), "clusterscoped.controller.cattle.io/cluster-roletemplate-sync_"))
 	cleanAnnotations := cleanAnnotations(obj.GetAnnotations(), "lifecycle.cattle.io/create.cluster-roletemplate-sync_")
 

diff --git a/pkg/controllers/management/auth/token.go b/pkg/controllers/management/auth/token.go
@@ -1,9 +1,10 @@
 package auth
 
 import (
+	v3 "github.com/rancher/rancher/pkg/apis/management.cattle.io/v3"
 	tokenUtil "github.com/rancher/rancher/pkg/auth/tokens"
 	"github.com/rancher/rancher/pkg/features"
-	v3 "github.com/rancher/rancher/pkg/generated/norman/management.cattle.io/v3"
+	wrangmgmtv3 "github.com/rancher/rancher/pkg/generated/controllers/management.cattle.io/v3"
 	"github.com/rancher/rancher/pkg/types/config"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -14,16 +15,16 @@ const (
 )
 
 type TokenController struct {
-	tokens               v3.TokenInterface
-	userAttributes       v3.UserAttributeInterface
-	userAttributesLister v3.UserAttributeLister
+	tokens               wrangmgmtv3.TokenController
+	userAttributes       wrangmgmtv3.UserAttributeController
+	userAttributesLister wrangmgmtv3.UserAttributeCache
 }
 
 func newTokenController(mgmt *config.ManagementContext) *TokenController {
 	n := &TokenController{
-		tokens:               mgmt.Management.Tokens(""),
-		userAttributes:       mgmt.Management.UserAttributes(""),
-		userAttributesLister: mgmt.Management.UserAttributes("").Controller().Lister(),
+		tokens:               mgmt.Wrangler.Mgmt.Token(),
+		userAttributes:       mgmt.Wrangler.Mgmt.UserAttribute(),
+		userAttributesLister: mgmt.Wrangler.Mgmt.UserAttribute().Cache(),
 	}
 	return n
 }
@@ -104,7 +105,7 @@ func (t *TokenController) userAttributesNeedsRefresh(user string) (bool, error)
 		return false, nil
 	}
 
-	userAttribute, err := t.userAttributesLister.Get("", user)
+	userAttribute, err := t.userAttributesLister.Get(user)
 	if err != nil {
 		if errors.IsNotFound(err) {
 			return false, nil
@@ -115,7 +116,7 @@ func (t *TokenController) userAttributesNeedsRefresh(user string) (bool, error)
 }
 
 func (t *TokenController) triggerUserAttributesRefresh(user string) error {
-	userAttribute, err := t.userAttributesLister.Get("", user)
+	userAttribute, err := t.userAttributesLister.Get(user)
 	if err != nil {
 		return err
 	}