Skip to content

Commit e4b7567

Browse files
andrewlecuyerjkatz
authored andcommitted
Update RBAC Reconcile Order
Reconcile roles and rolebindings before secrets since those roles contain the privs needed to reconcile secrets within a target namespace.
1 parent 66d70ce commit e4b7567

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

ns/nslogic.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,13 @@ func ReconcileTargetRBAC(clientset *kubernetes.Clientset, pgoNamespace,
280280
errs = append(errs, err.Error())
281281
}
282282

283+
if err := reconcileRoles(clientset, targetNamespace); err != nil {
284+
errs = append(errs, err.Error())
285+
}
286+
if err := reconcileRoleBindings(clientset, pgoNamespace, targetNamespace); err != nil {
287+
errs = append(errs, err.Error())
288+
}
289+
283290
// If a SA was created or updated, or if it doesnt exist, ensure the image pull secrets
284291
// are up to date
285292
for _, reference := range operator.ImagePullSecrets {
@@ -304,13 +311,6 @@ func ReconcileTargetRBAC(clientset *kubernetes.Clientset, pgoNamespace,
304311
}
305312
}
306313

307-
if err := reconcileRoles(clientset, targetNamespace); err != nil {
308-
errs = append(errs, err.Error())
309-
}
310-
if err := reconcileRoleBindings(clientset, pgoNamespace, targetNamespace); err != nil {
311-
errs = append(errs, err.Error())
312-
}
313-
314314
if len(errs) > 0 {
315315
return fmt.Errorf(strings.Join(errs, "/n"))
316316
}

0 commit comments

Comments
 (0)