Merge pull request #2828 from 0xff-dev/main

k8s-ci-robot · web-flow · commit b2e2f29683ef · 2025-03-16T04:21:47.000-07:00
🐛 fix(controllerutil): avoid panic when the MutateFn is nil
diff --git a/pkg/controller/controllerutil/controllerutil.go b/pkg/controller/controllerutil/controllerutil.go
@@ -310,18 +310,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) {

Original file line number	Diff line number	Diff line change
`@@ -310,18 +310,23 @@ func CreateOrUpdate(ctx context.Context, c client.Client, obj client.Object, f M`
`310`	`310`	`if !apierrors.IsNotFound(err) {`
`311`	`311`	`return OperationResultNone, err`
`312`	`312`	`}`
`313`		`- if err := mutate(f, key, obj); err != nil {`
`314`		`- return OperationResultNone, err`
	`313`	`+ if f != nil {`
	`314`	`+ if err := mutate(f, key, obj); err != nil {`
	`315`	`+ return OperationResultNone, err`
	`316`	`+ }`
`315`	`317`	`}`
	`318`	`+`
`316`	`319`	`if err := c.Create(ctx, obj); err != nil {`
`317`	`320`	`return OperationResultNone, err`
`318`	`321`	`}`
`319`	`322`	`return OperationResultCreated, nil`
`320`	`323`	`}`
`321`	`324`
`322`	`325`	`existing := obj.DeepCopyObject()`
`323`		`- if err := mutate(f, key, obj); err != nil {`
`324`		`- return OperationResultNone, err`
	`326`	`+ if f != nil {`
	`327`	`+ if err := mutate(f, key, obj); err != nil {`
	`328`	`+ return OperationResultNone, err`
	`329`	`+ }`
`325`	`330`	`}`
`326`	`331`
`327`	`332`	`if equality.Semantic.DeepEqual(existing, obj) {`