marco/plugin-barman-cloud
1
0
Fork 0
mirror of https://github.com/cloudnative-pg/plugin-barman-cloud.git synced 2026-07-08 10:42:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: merge labels instead of replacing

Browse Source 
Signed-off-by: Gabriele Fedi <gabriele.fedi@enterprisedb.com>
This commit is contained in:
Gabriele Fedi 2026-04-21 10:01:25 +02:00 committed by Leonardo Cecchi
parent 3b6c25c2dc
commit 48575f5f8c
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
internal/cnpgi/operator/rbac/ensure.go
View File

@ -91,7 +91,7 @@ func EnsureRoleRules(
// the desired state. // the desired state.
// //
// This function is called from the Pre hook (gRPC). It creates the RoleBinding // This function is called from the Pre hook (gRPC). It creates the RoleBinding
// if it does not exist, otherwise it patches RoleRef, Subjects, and labels to match // if it does not exist, otherwise it patches Subjects and labels to match
// the desired state. // the desired state.
func EnsureRoleBinding(ctx context.Context, c client.Client, cluster *cnpgv1.Cluster) error { func EnsureRoleBinding(ctx context.Context, c client.Client, cluster *cnpgv1.Cluster) error {
contextLogger := log.FromContext(ctx) contextLogger := log.FromContext(ctx)
@ -112,6 +112,7 @@ func EnsureRoleBinding(ctx context.Context, c client.Client, cluster *cnpgv1.Clu
"namespace", desiredRoleBinding.Namespace) "namespace", desiredRoleBinding.Namespace)
return c.Create(ctx, desiredRoleBinding) return c.Create(ctx, desiredRoleBinding)
} }
return err
} }
if !roleBindingNeedsUpdate(roleBinding, desiredRoleBinding) { if !roleBindingNeedsUpdate(roleBinding, desiredRoleBinding) {
@ -122,8 +123,12 @@ func EnsureRoleBinding(ctx context.Context, c client.Client, cluster *cnpgv1.Clu
"name", roleBinding.Name, "namespace", roleBinding.Namespace) "name", roleBinding.Name, "namespace", roleBinding.Namespace)
oldRoleBinding := roleBinding.DeepCopy() oldRoleBinding := roleBinding.DeepCopy()
roleBinding.Labels = desiredRoleBinding.Labels if roleBinding.Labels == nil {
roleBinding.RoleRef = desiredRoleBinding.RoleRef roleBinding.Labels = make(map[string]string, len(desiredRoleBinding.Labels))
}
for k, v := range desiredRoleBinding.Labels {
roleBinding.Labels[k] = v
}
roleBinding.Subjects = desiredRoleBinding.Subjects roleBinding.Subjects = desiredRoleBinding.Subjects
return c.Patch(ctx, roleBinding, client.MergeFrom(oldRoleBinding)) return c.Patch(ctx, roleBinding, client.MergeFrom(oldRoleBinding))
@ -222,14 +227,6 @@ func labelsNeedUpdate(existing, desired map[string]string) bool {
// roleBindingNeedsUpdate returns true if the existing RoleBinding's // roleBindingNeedsUpdate returns true if the existing RoleBinding's
// RoleRef or Subjects differ from the desired, or if labels need update. // RoleRef or Subjects differ from the desired, or if labels need update.
func roleBindingNeedsUpdate(existing, desired *rbacv1.RoleBinding) bool { func roleBindingNeedsUpdate(existing, desired *rbacv1.RoleBinding) bool {
if existing == nil || desired == nil {
return existing != desired
}
if !equality.Semantic.DeepEqual(existing.RoleRef, desired.RoleRef) {
return true
}
if !equality.Semantic.DeepEqual(existing.Subjects, desired.Subjects) { if !equality.Semantic.DeepEqual(existing.Subjects, desired.Subjects) {
return true return true
} }