Merge pull request rook#13624 from rook/mergify/bp/release-1.13/pr-13619

operator: Increase resource limits to 1.5 CPU (backport rook#13619)
travisn · Jan 25, 2024 · 7c97d13 · 7c97d13
2 parents 0f72565 + e95be76
commit 7c97d13
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/Documentation/Helm-Charts/operator-chart.md b/Documentation/Helm-Charts/operator-chart.md
@@ -150,7 +150,7 @@ The following table lists the configurable parameters of the rook-operator chart
 | `pspEnable` | If true, create & use PSP resources | `false` |
 | `rbacAggregate.enableOBCs` | If true, create a ClusterRole aggregated to [user facing roles](https://kubernetes.io/docs/reference/access-authn-authz/rbac/#user-facing-roles) for objectbucketclaims | `false` |
 | `rbacEnable` | If true, create & use RBAC resources | `true` |
-| `resources` | Pod resource requests & limits | `{"limits":{"cpu":"500m","memory":"512Mi"},"requests":{"cpu":"100m","memory":"128Mi"}}` |
+| `resources` | Pod resource requests & limits | `{"limits":{"cpu":"1500m","memory":"512Mi"},"requests":{"cpu":"200m","memory":"128Mi"}}` |
 | `scaleDownOperator` | If true, scale down the rook operator. This is useful for administrative actions where the rook operator must be scaled down, while using gitops style tooling to deploy your helm charts. | `false` |
 | `tolerations` | List of Kubernetes [`tolerations`](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) to add to the Deployment. | `[]` |
 | `unreachableNodeTolerationSeconds` | Delay to use for the `node.kubernetes.io/unreachable` pod failure toleration to override the Kubernetes default of 5 minutes | `5` |

diff --git a/deploy/charts/rook-ceph/values.yaml b/deploy/charts/rook-ceph/values.yaml
@@ -23,10 +23,10 @@ crds:
 # -- Pod resource requests & limits
 resources:
   limits:
-    cpu: 500m
+    cpu: 1500m
     memory: 512Mi
   requests:
-    cpu: 100m
+    cpu: 200m
     memory: 128Mi
 
 # -- Kubernetes [`nodeSelector`](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector) to add to the Deployment.

diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml
@@ -642,10 +642,10 @@ data:
   #   - name: DISCOVER_DAEMON_RESOURCES
   #     resources:
   #       limits:
-  #         cpu: 500m
+  #         cpu: 1500m
   #         memory: 512Mi
   #       requests:
-  #         cpu: 100m
+  #         cpu: 200m
   #         memory: 128Mi
 ---
 # The deployment for the rook operator

diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml
@@ -671,10 +671,10 @@ spec:
           # Recommended resource requests and limits, if desired
           #resources:
           #  limits:
-          #    cpu: 500m
+          #    cpu: 1500m
           #    memory: 512Mi
           #  requests:
-          #    cpu: 100m
+          #    cpu: 200m
           #    memory: 128Mi
 
           #  Uncomment it to run lib bucket provisioner in multithreaded mode