Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🐛 fix(controllerutil): avoid panic when the MutateFn is nil #2828

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

🐛 fix(controllerutil): avoid panic when the MutateFn is nil #2828

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions pkg/controller/controllerutil/controllerutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,18 +279,23 @@ func CreateOrUpdate(ctx context.Context, c client.Client, obj client.Object, f M
if !apierrors.IsNotFound(err) {
return OperationResultNone, err
}
if err := mutate(f, key, obj); err != nil {
return OperationResultNone, err
if f != nil {
if err := mutate(f, key, obj); err != nil {
return OperationResultNone, err
}
}

if err := c.Create(ctx, obj); err != nil {
return OperationResultNone, err
}
return OperationResultCreated, nil
}

existing := obj.DeepCopyObject()
if err := mutate(f, key, obj); err != nil {
return OperationResultNone, err
if f != nil {
if err := mutate(f, key, obj); err != nil {
return OperationResultNone, err
}
}

if equality.Semantic.DeepEqual(existing, obj) {
Expand Down