fix: increase telemetry-sidecar CPU (#581)

Signed-off-by: Alan Smith <209585+mo-getter@users.noreply.github.com>
Co-authored-by: Kevin DiMichel <56850465+kevin-dimichel@users.noreply.github.com>

Author: mo-getter

docker/common-services.yaml

@@ -234,10 +234,10 @@ services:
     deploy:
       resources:
         limits:
-          cpus: "0.10"
+          cpus: "0.20"
           memory: 512M
         reservations:
-          cpus: "0.10"
+          cpus: "0.20"
           memory: 512M
     restart: always
 
@@ -282,10 +282,10 @@ services:
     deploy:
       resources:
         limits:
-          cpus: "0.10"
+          cpus: "0.20"
           memory: 512M
         reservations:
-          cpus: "0.10"
+          cpus: "0.20"
           memory: 512M
     restart: always
 

docker/docs/upgrading.md

@@ -112,14 +112,18 @@ plus a `telemetry-redis` service that buffers the streamed metrics and
 logs.
 
 **Resource impact:**
-Each sidecar reserves `0.10` CPUs and `512M` memory
-(reservation == limit).
-A default deploy adds four sidecars
-(`fiftyone-app` + `teams-api` + `teams-plugins` + one `teams-do`), so
-expect roughly **+0.4 CPU** and **+2 GiB memory** in additional
-resource usage, plus the bundled `telemetry-redis` service (`0.10` CPU
-/ `256M` memory reservation, `0.25` / `512M` limits) and its
-`telemetry-redis-data` named volume.
+By default the telemetry requires an additional `0.55` CPU and `1.5Gi` of
+resources used by:
+
+- `telemetry-sidecar` container
+  - `teams-api`: 0.1 CPU and 512 Mi memory
+  - `fiftyone-app`: 0.2 CPU and 512 Mi memory
+- Redis container
+  - 0.25 CPU and 512Mi memory
+
+The additional required resources depends of replica count for each
+deployment.
+The optional deployments may also increase this amount.
 
 ##### Host Requirements
 

helm/docs/upgrading.md

@@ -155,12 +155,25 @@ workloads (and as a native sidecar on on-demand delegated-operator
 buffers the streamed metrics and logs.
 
 **Resource impact:**
-Each sidecar requests `100m` CPU and `512Mi` memory (request == limit).
-A default deploy adds four sidecars
-(`teams-api` + `fiftyone-app` + `teams-plugins` + one
-delegated-operator), so expect roughly **+400m CPU** and **+2 GiB
-memory** in additional resource usage, plus the bundled Redis (`250m`
-CPU / `512Mi` memory, request == limit) backed by an `emptyDir`.
+Each sidecar requests `200m` CPU and `512Mi` memory (request == limit).
+A default deploy adds three sidecars
+(`teams-api` + 2 x `fiftyone-app`),
+so expect roughly **+600m CPU** and **+1.5 GiB memory** in additional
+resource usage, plus the bundled Redis
+(`250m` CPU / `512Mi` memory, request == limit)
+By default the telemetry requires an additional `850m` CPU and `2Gi` of
+resources used by:
+
+- `telemetry-sidecar` container
+  - `200m` CPU and `512Mi` memory per each replica of
+    - `teams-api` x 1
+    - `fiftyone-app` x 2
+- Redis container
+  - `250m` CPU and `512Mi` memory
+
+The additional required resources depends of replica count for each
+deployment.
+The optional deployments may also increase this amount.
 Tune via `telemetry.sidecar.resources` and `telemetry.redis.resources`.
 Opt into a `PersistentVolumeClaim` with
 `telemetry.redis.persistence.enabled: true`.

helm/fiftyone-teams-app/README.md

@@ -1100,7 +1100,7 @@ If pods show unhealthy states (e.g., `0/1`, `CrashLoopBackOff`, `Pending`):
 | telemetry.sidecar.image.pullPolicy | string | `"Always"` | Instruct when the kubelet should pull (download) the specified image. One of `IfNotPresent`, `Always` or `Never`. [Reference][image-pull-policy]. |
 | telemetry.sidecar.image.repository | string | `"voxel51/telemetry-sidecar"` | Container image for `telemetry-sidecar`. |
 | telemetry.sidecar.image.tag | string | `""` | Image tag for `telemetry-sidecar`. Defaults to `Chart.AppVersion`. |
-| telemetry.sidecar.resources | object | `{"limits":{"cpu":"100m","memory":"512Mi"},"requests":{"cpu":"100m","memory":"512Mi"}}` | Resource requests/limits for each `telemetry-sidecar` container. |
+| telemetry.sidecar.resources | object | `{"limits":{"cpu":"200m","memory":"512Mi"},"requests":{"cpu":"200m","memory":"512Mi"}}` | Resource requests/limits for each `telemetry-sidecar` container. |
 
 <!-- markdownlint-enable MD060 -->
 

helm/fiftyone-teams-app/values.schema.json

@@ -4274,7 +4274,7 @@
                 "limits": {
                   "properties": {
                     "cpu": {
-                      "default": "100m",
+                      "default": "200m",
                       "title": "cpu",
                       "type": "string"
                     },
@@ -4291,7 +4291,7 @@
                 "requests": {
                   "properties": {
                     "cpu": {
-                      "default": "100m",
+                      "default": "200m",
                       "title": "cpu",
                       "type": "string"
                     },

helm/fiftyone-teams-app/values.yaml

@@ -1699,10 +1699,10 @@ telemetry:
     # -- Resource requests/limits for each `telemetry-sidecar` container.
     resources:
       requests:
-        cpu: 100m
+        cpu: 200m
         memory: 512Mi
       limits:
-        cpu: 100m
+        cpu: 200m
         memory: 512Mi
   # -- ServiceAccount names (in `namespace.name`) bound to the telemetry
   # pod-logs Role. When empty, the RoleBinding binds the chart's main app