fix(forgejo): resolve merge conflict — keep 60Gi, revert CPU to 1000m

2026-11-02 13:42:46 +08:00
parent aa992872cb 1fd5f25932
commit b7de85e01e
2 changed files with 93 additions and 3 deletions
@@ -161,9 +161,9 @@ ingress:
 # The database was never the bottleneck. A real action_runner UPDATE measured
 # 2.133ms with zero lock waits, so this is CPU starvation in Gitea itself.
 #
-# requests.cpu rises to 750m because a request below real usage earns the pod
-# little scheduling weight during contention. limits.cpu rises to 3000m
-# because diff computation is bursty and needs room to run without throttling.
+# requests.cpu stays 200m and limits.cpu stays 1000m. The 3000m limit was a
+# temporary measure while the Actions stall was diagnosed; the real fix landed
+# elsewhere, so the limit is back to the original.
 #
 # Caution: this pod runs on talos-cp-3, a control-plane node. If Gitea
 # throttles again at 1000m, move the workload off the control plane rather