From 3cd7bfe6d4f0dade124018aa96663102fab2cecf Mon Sep 17 00:00:00 2001 From: Massimiliano Giovagnoli Date: Sat, 13 Aug 2022 18:29:09 +0200 Subject: [PATCH] chore(controllers/tenant): rename tenant clusterrole controller Signed-off-by: Massimiliano Giovagnoli --- controllers/tenant/{roles.go => clusterroles.go} | 8 ++++---- controllers/tenant/manager.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) rename controllers/tenant/{roles.go => clusterroles.go} (78%) diff --git a/controllers/tenant/roles.go b/controllers/tenant/clusterroles.go similarity index 78% rename from controllers/tenant/roles.go rename to controllers/tenant/clusterroles.go index c62e7b46..21cf4757 100644 --- a/controllers/tenant/roles.go +++ b/controllers/tenant/clusterroles.go @@ -16,13 +16,13 @@ const ( // Sync the Tenant Owner specific cluster-roles. // When the Tenant is configured GitOpsReady additional (Cluster)Roles are created, then bound. -func (r *Manager) syncRoles(ctx context.Context, tenant *capsulev1beta1.Tenant) (err error) { +func (r *Manager) syncClusterRoles(ctx context.Context, tenant *capsulev1beta1.Tenant) (err error) { // If the Tenant will be reconciled the GitOps-way, // Tenant Owners might be machine GitOps reconciler identities. if tenant.Spec.GitOpsReady { for _, owner := range tenant.Spec.Owners { - if err = r.ensureOwnerRole(ctx, tenant, &owner, ImpersonatorRoleName); err != nil { + if err = r.ensureOwnerClusterRole(ctx, tenant, &owner, ImpersonatorRoleName); err != nil { r.Log.Error(err, "Reconciliation for ClusterRole failed", "ClusterRole", ImpersonatorRoleName) return err } @@ -32,7 +32,7 @@ func (r *Manager) syncRoles(ctx context.Context, tenant *capsulev1beta1.Tenant) return } -func (r *Manager) ensureOwnerRole(ctx context.Context, tenant *capsulev1beta1.Tenant, owner *capsulev1beta1.OwnerSpec, roleName string) (err error) { +func (r *Manager) ensureOwnerClusterRole(ctx context.Context, tenant *capsulev1beta1.Tenant, owner *capsulev1beta1.OwnerSpec, roleName string) (err error) { switch roleName { case ImpersonatorRoleName: clusterRole := &rbacv1.ClusterRole{ @@ -48,7 +48,7 @@ func (r *Manager) ensureOwnerRole(ctx context.Context, tenant *capsulev1beta1.Te resourceName := owner.Name if owner.Kind == capsulev1beta1.ServiceAccountOwner { - resourceName = "system:serviceaccount:" + tenant.Namespace + ":" + owner.Name + resourceName = owner.Name } _, err = controllerutil.CreateOrUpdate(ctx, r.Client, clusterRole, func() error { diff --git a/controllers/tenant/manager.go b/controllers/tenant/manager.go index d125713c..7e7a53c0 100644 --- a/controllers/tenant/manager.go +++ b/controllers/tenant/manager.go @@ -105,11 +105,11 @@ func (r Manager) Reconcile(ctx context.Context, request ctrl.Request) (result ct return } - // Ensuring Roles resources - r.Log.Info("Ensuring Roles for Owners and Tenant") + // Ensuring ClusterRoles resources + r.Log.Info("Ensuring ClusterRoles for Owners and Tenant") - if err = r.syncRoles(ctx, instance); err != nil { - r.Log.Error(err, "Cannot sync Roles items") + if err = r.syncClusterRoles(ctx, instance); err != nil { + r.Log.Error(err, "Cannot sync ClusterRoles items") return }