From 5134666ebdfb841bc8b8c40a307225173a2cd30d Mon Sep 17 00:00:00 2001
From: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
Date: Thu, 21 May 2026 12:57:02 +0500
Subject: [PATCH] fix(cluster-api): fix kamaji OOM and set limits on unset
 providers

The kamaji control-plane-provider override in templates/providers.yaml
targeted containers[name=manager], but the upstream container is named
"controller". The CAPI operator merges container overrides by name, so
the intended cpu: 1 / memory: 1024Mi limits were silently dropped and
the upstream default of memory: 128Mi was used, producing repeated
OOMKilled restarts of the kamaji controller (exit code 137).

The other three providers (core, bootstrap, infraprovider/kubevirt)
ship upstream with no resources block and have no cozystack override,
so they run BestEffort and are first to evict under memory pressure.
Set modest limits (500m / 256Mi) and requests (10m / 64Mi) matching
typical CAPI controller-manager footprint.

Assisted-By: Claude <noreply@anthropic.com>
Signed-off-by: Myasnikov Daniil <myasnikovdaniil2001@gmail.com>
(cherry picked from commit 6ae66f72a659231a58331c8636d6a363efb4e103)
---
 .../capi-providers-bootstrap/templates/providers.yaml  | 10 ++++++++++
 .../capi-providers-core/templates/providers.yaml       | 10 ++++++++++
 .../capi-providers-cpprovider/templates/providers.yaml |  2 +-
 .../templates/providers.yaml                           | 10 ++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/packages/system/capi-providers-bootstrap/templates/providers.yaml b/packages/system/capi-providers-bootstrap/templates/providers.yaml
index 8e96ac089..5b741b3b5 100644
--- a/packages/system/capi-providers-bootstrap/templates/providers.yaml
+++ b/packages/system/capi-providers-bootstrap/templates/providers.yaml
@@ -9,3 +9,13 @@ spec:
     selector:
       matchLabels:
         bootstrap-components: cozy
+  deployment:
+    containers:
+    - name: manager
+      resources:
+        limits:
+          cpu: 500m
+          memory: 256Mi
+        requests:
+          cpu: 10m
+          memory: 64Mi
diff --git a/packages/system/capi-providers-core/templates/providers.yaml b/packages/system/capi-providers-core/templates/providers.yaml
index 833b39bc5..280397ede 100644
--- a/packages/system/capi-providers-core/templates/providers.yaml
+++ b/packages/system/capi-providers-core/templates/providers.yaml
@@ -10,3 +10,13 @@ spec:
     selector:
       matchLabels:
         core-components: cozy
+  deployment:
+    containers:
+    - name: manager
+      resources:
+        limits:
+          cpu: 500m
+          memory: 256Mi
+        requests:
+          cpu: 10m
+          memory: 64Mi
diff --git a/packages/system/capi-providers-cpprovider/templates/providers.yaml b/packages/system/capi-providers-cpprovider/templates/providers.yaml
index 125a82c72..71623a6ee 100644
--- a/packages/system/capi-providers-cpprovider/templates/providers.yaml
+++ b/packages/system/capi-providers-cpprovider/templates/providers.yaml
@@ -11,7 +11,7 @@ spec:
         cp-components: cozy
   deployment:
     containers:
-    - name: manager
+    - name: controller
       resources:
         limits:
           cpu: "1"
diff --git a/packages/system/capi-providers-infraprovider/templates/providers.yaml b/packages/system/capi-providers-infraprovider/templates/providers.yaml
index 4bb4a6afc..3a73e32f8 100644
--- a/packages/system/capi-providers-infraprovider/templates/providers.yaml
+++ b/packages/system/capi-providers-infraprovider/templates/providers.yaml
@@ -9,3 +9,13 @@ spec:
     selector:
       matchLabels:
         infraprovider-components: cozy
+  deployment:
+    containers:
+    - name: manager
+      resources:
+        limits:
+          cpu: 500m
+          memory: 256Mi
+        requests:
+          cpu: 10m
+          memory: 64Mi