github/capsule
1
0
Fork 0
mirror of https://github.com/projectcapsule/capsule.git synced 2026-08-25 16:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(controllers/tenant): rename tenant clusterrole controller

Browse Source 
Signed-off-by: Massimiliano Giovagnoli <me@maxgio.it>
This commit is contained in:
Massimiliano Giovagnoli
2022-08-13 18:29:09 +02:00
parent ff53cc2f38
commit 3cd7bfe6d4
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/tenant/roles.go → controllers/tenant/clusterroles.go
+4 -4
View File
@@ -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 {
controllers/tenant/manager.go
+4 -4
View File
@@ -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
}