merge: resolve conflict from Nicolas_local_ops into master

This commit is contained in:
Nicolas 2025-07-24 18:20:41 +08:00
commit 6373a82351

View File

@ -112,4 +112,4 @@ reconciler:
memory: 256Mi memory: 256Mi
controlledResources: controlledResources:
- cpu - cpu
- memory - memory