merge: resolve conflict from Nicolas_local_ops into master
This commit is contained in:
commit
6373a82351
@ -112,4 +112,4 @@ reconciler:
|
||||
memory: 256Mi
|
||||
controlledResources:
|
||||
- cpu
|
||||
- memory
|
||||
- memory
|
||||
|
||||
Loading…
Reference in New Issue
Block a user