Skip to content

Commit eed982a

Browse files
committed
fix: bump fiftyone-app limit, update docker docs, fix md linting
1 parent 68e571b commit eed982a

3 files changed

Lines changed: 27 additions & 21 deletions

File tree

docker/common-services.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,10 @@ services:
234234
deploy:
235235
resources:
236236
limits:
237-
cpus: "0.10"
237+
cpus: "0.20"
238238
memory: 512M
239239
reservations:
240-
cpus: "0.10"
240+
cpus: "0.20"
241241
memory: 512M
242242
restart: always
243243

docker/docs/upgrading.md

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,18 @@ plus a `telemetry-redis` service that buffers the streamed metrics and
112112
logs.
113113

114114
**Resource impact:**
115-
Each sidecar reserves `0.10` CPUs and `512M` memory, except the
116-
`teams-plugins` container which reserves 0.20 CPU. (reservation == limit).
117-
A default deploy (using `compose.yaml` rather than one of its variants) adds
118-
two sidecars
119-
(`fiftyone-app` + `teams-api`), so
120-
expect roughly **+0.2 CPU** and **+1 GiB memory** in additional
121-
resource usage, plus the bundled `telemetry-redis` service (`0.10` CPU
122-
/ `256M` memory reservation, `0.25` / `512M` limits) and its
123-
`telemetry-redis-data` named volume.
115+
By default the telemetry requires an additional `0.55` CPU and `1.5Gi` of
116+
resources used by:
117+
118+
- `telemetry-sidecar` container
119+
- `teams-api`: 0.1 CPU and 512 Mi memory
120+
- `fiftyone-app`: 0.2 CPU and 512 Mi memory
121+
- Redis container
122+
- 0.25 CPU and 512Mi memory
123+
124+
The additional required resources depends of replica count for each
125+
deployment.
126+
The optional deployments may also increase this amount.
124127

125128
##### Host Requirements
126129

helm/docs/upgrading.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,19 @@ A default deploy adds three sidecars
161161
so expect roughly **+600m CPU** and **+1.5 GiB memory** in additional
162162
resource usage, plus the bundled Redis
163163
(`250m` CPU / `512Mi` memory, request == limit)
164-
By default the telemetry requires an additional `850m` CPU and `2Gi` of resources used by
165-
166-
* `telemetry-sidecar` container
167-
* `200m` CPU and `512Mi` memory per each replica of
168-
* `teams-api` x 1
169-
* `fiftyone-app` x 2
170-
* Redis container
171-
* `250m` CPU and `512Mi` memory
172-
173-
The additional required resources depends of replica count for each deployment. The optional deployments may also increase this amount.
164+
By default the telemetry requires an additional `850m` CPU and `2Gi` of
165+
resources used by:
166+
167+
- `telemetry-sidecar` container
168+
- `200m` CPU and `512Mi` memory per each replica of
169+
- `teams-api` x 1
170+
- `fiftyone-app` x 2
171+
- Redis container
172+
- `250m` CPU and `512Mi` memory
173+
174+
The additional required resources depends of replica count for each
175+
deployment.
176+
The optional deployments may also increase this amount.
174177
Tune via `telemetry.sidecar.resources` and `telemetry.redis.resources`.
175178
Opt into a `PersistentVolumeClaim` with
176179
`telemetry.redis.persistence.enabled: true`.

0 commit comments

Comments
 (0)