Skip to content

Commit 8c4b06d

Browse files
ci(release): Automated merge from release/v2.20.0 workflow
chore: release v2.20.0
2 parents 6cd3ad2 + 293ffbc commit 8c4b06d

24 files changed

Lines changed: 166 additions & 149 deletions

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SHELL := $(SHELL) -e
22
ASDF := $(shell asdf where golang)
3-
VERSION ?= 2.19.0
3+
VERSION ?= 2.20.0
44

55
# Help
66
.PHONY: $(shell sed -n -e '/^$$/ { n ; /^[^ .\#][^ ]*:/ { s/:.*$$// ; p ; } ; }' $(MAKEFILE_LIST))

docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ You can override the default image used by any service in
240240
```yaml
241241
services:
242242
fiftyone-app:
243-
image: voxel51/fiftyone-app-torch:v2.19.0
243+
image: voxel51/fiftyone-app-torch:v2.20.0
244244
```
245245

246246
> [!NOTE]

docker/common-services.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
services:
33
fiftyone-app-common:
4-
image: voxel51/fiftyone-app:v2.19.0
4+
image: voxel51/fiftyone-app:v2.20.0
55
environment:
66
API_URL: ${API_URL}
77
FIFTYONE_APP_DEFAULT_QUERY_PERFORMANCE: ${FIFTYONE_APP_DEFAULT_QUERY_PERFORMANCE}
@@ -33,7 +33,7 @@ services:
3333
restart: always
3434

3535
teams-api-common:
36-
image: voxel51/fiftyone-teams-api:v2.19.0
36+
image: voxel51/fiftyone-teams-api:v2.20.0
3737
environment:
3838
API_EXTERNAL_URL: ${FIFTYONE_API_URI}
3939
CAS_BASE_URL: ${CAS_BASE_URL:-http://teams-cas:3000/cas/api}
@@ -63,13 +63,13 @@ services:
6363
restart: always
6464

6565
teams-app-common:
66-
image: voxel51/fiftyone-teams-app:v2.19.0
66+
image: voxel51/fiftyone-teams-app:v2.20.0
6767
environment:
6868
API_URL: ${API_URL}
6969
APP_USE_HTTPS: ${APP_USE_HTTPS:-true}
7070
FIFTYONE_API_URI: ${FIFTYONE_API_URI:-"Please contact your Admin for an API URI"}
7171
FIFTYONE_APP_ALLOW_MEDIA_EXPORT: ${FIFTYONE_APP_ALLOW_MEDIA_EXPORT:-true}
72-
FIFTYONE_APP_TEAMS_SDK_RECOMMENDED_VERSION: 2.19.0
72+
FIFTYONE_APP_TEAMS_SDK_RECOMMENDED_VERSION: 2.20.0
7373
FIFTYONE_AUTH_SECRET: ${FIFTYONE_AUTH_SECRET}
7474
FIFTYONE_SERVER_ADDRESS: ""
7575
FIFTYONE_SERVER_PATH_PREFIX: /api/proxy/fiftyone-teams
@@ -98,7 +98,7 @@ services:
9898
restart: always
9999

100100
teams-cas-common:
101-
image: voxel51/fiftyone-teams-cas:v2.19.0
101+
image: voxel51/fiftyone-teams-cas:v2.20.0
102102
environment:
103103
CAS_DATABASE_NAME: ${CAS_DATABASE_NAME:-cas}
104104
CAS_DEFAULT_USER_ROLE: ${CAS_DEFAULT_USER_ROLE:-GUEST}
@@ -133,7 +133,7 @@ services:
133133
read_only: true
134134

135135
teams-plugins-common:
136-
image: voxel51/fiftyone-app-torch:v2.19.0
136+
image: voxel51/fiftyone-app-torch:v2.20.0
137137
environment:
138138
API_URL: ${API_URL}
139139
FIFTYONE_AUTH_SECRET: ${FIFTYONE_AUTH_SECRET}
@@ -161,7 +161,7 @@ services:
161161
restart: always
162162

163163
teams-do-common:
164-
image: voxel51/fiftyone-teams-cv-full:v2.19.0
164+
image: voxel51/fiftyone-teams-cv-full:v2.20.0
165165
# Telemetry default-on requires teams-do to share its PID namespace
166166
# with a single sidecar (compose's `pid: "service:<name>"` only joins
167167
# one replica). Force replicas=1 to keep the 1:1 pairing deterministic.
@@ -215,7 +215,7 @@ services:
215215
# target's PID namespace so the sidecar can read /proc/<pid>/fd/1 and
216216
# psutil can see the target's process.
217217
fiftyone-app-telemetry-common:
218-
image: voxel51/telemetry-sidecar:v2.19.0
218+
image: voxel51/telemetry-sidecar:v2.20.0
219219
pid: "service:fiftyone-app"
220220
# Matches the workload image's USER 1000:1000 so the kernel's
221221
# ptrace_may_access() check on /proc/<workload-pid>/fd/1 reads passes via the
@@ -234,15 +234,15 @@ 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

244244
teams-api-telemetry-common:
245-
image: voxel51/telemetry-sidecar:v2.19.0
245+
image: voxel51/telemetry-sidecar:v2.20.0
246246
pid: "service:teams-api"
247247
user: "1000:1000"
248248
cap_drop:
@@ -266,7 +266,7 @@ services:
266266
restart: always
267267

268268
teams-plugins-telemetry-common:
269-
image: voxel51/telemetry-sidecar:v2.19.0
269+
image: voxel51/telemetry-sidecar:v2.20.0
270270
pid: "service:teams-plugins"
271271
user: "1000:1000"
272272
cap_drop:
@@ -282,15 +282,15 @@ services:
282282
deploy:
283283
resources:
284284
limits:
285-
cpus: "0.10"
285+
cpus: "0.20"
286286
memory: 512M
287287
reservations:
288-
cpus: "0.10"
288+
cpus: "0.20"
289289
memory: 512M
290290
restart: always
291291

292292
teams-do-telemetry-common:
293-
image: voxel51/telemetry-sidecar:v2.19.0
293+
image: voxel51/telemetry-sidecar:v2.20.0
294294
pid: "service:teams-do"
295295
user: "1000:1000"
296296
cap_drop:

docker/docs/configuring-gpu-workloads.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ services:
7373
service: teams-do-common
7474

7575
teams-do-with-gpu:
76-
image: voxel51/fiftyone-teams-cv-full:v2.19.0
76+
image: voxel51/fiftyone-teams-cv-full:v2.20.0
7777
command: >
7878
/bin/sh -c "fiftyone delegated launch -t remote -n 'teams-do-with-gpu' -m"
7979
environment:

docker/docs/upgrading.md

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ quickstart 0.21.2
8484

8585
### From FiftyOne Enterprise Version 2.0.0 and Later
8686

87-
1. [Upgrade to FiftyOne Enterprise version 2.19.0](#upgrading-from-previous-versions)
87+
1. [Upgrade to FiftyOne Enterprise version 2.20.0](#upgrading-from-previous-versions)
8888
1. Voxel51 recommends upgrading all FiftyOne Enterprise SDK users to FiftyOne Enterprise
89-
version 2.19.0
89+
version 2.20.0
9090
1. Login to the FiftyOne Enterprise UI
9191
1. To obtain the CLI command to install the FiftyOne SDK associated with
9292
your FiftyOne Enterprise version, navigate to `Account > Install FiftyOne`
@@ -112,14 +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
116-
(reservation == limit).
117-
A default deploy adds four sidecars
118-
(`fiftyone-app` + `teams-api` + `teams-plugins` + one `teams-do`), so
119-
expect roughly **+0.4 CPU** and **+2 GiB memory** in additional
120-
resource usage, plus the bundled `telemetry-redis` service (`0.10` CPU
121-
/ `256M` memory reservation, `0.25` / `512M` limits) and its
122-
`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.
123127

124128
##### Host Requirements
125129

@@ -281,7 +285,7 @@ To utilize the prior image, update your `common-services.yaml` similar to the be
281285

282286
```yaml
283287
teams-do-common:
284-
image: voxel51/fiftyone-app:v2.19.0
288+
image: voxel51/fiftyone-app:v2.20.0
285289
```
286290
287291
#### FiftyOne Enterprise v2.2+ Delegated Operator Changes
@@ -316,7 +320,7 @@ Additionally,
316320

317321
### From FiftyOne Enterprise Versions 1.6.0 to 1.7.1
318322

319-
> **NOTE**: Upgrading to FiftyOne Enterprise v2.19.0 _requires_ a license file.
323+
> **NOTE**: Upgrading to FiftyOne Enterprise v2.20.0 _requires_ a license file.
320324
> Please contact your Customer Success Team before upgrading to FiftyOne Enterprise
321325
> 2.0 or beyond.
322326
>
@@ -351,15 +355,15 @@ Additionally,
351355
mv license.key "${LOCAL_LICENSE_FILE_DIR}/license"
352356
```
353357

354-
1. [Upgrade to FiftyOne Enterprise version 2.19.0](#upgrading-from-previous-versions)
355-
1. Upgrade FiftyOne Enterprise SDK users to FiftyOne Enterprise version 2.19.0
358+
1. [Upgrade to FiftyOne Enterprise version 2.20.0](#upgrading-from-previous-versions)
359+
1. Upgrade FiftyOne Enterprise SDK users to FiftyOne Enterprise version 2.20.0
356360
1. Login to the FiftyOne Enterprise UI
357361
1. To obtain the CLI command to install the FiftyOne SDK associated with
358362
your FiftyOne Enterprise version, navigate to `Account > Install FiftyOne`
359363
1. Upgrade all the datasets
360-
> **NOTE**: Any FiftyOne SDK less than 2.19.0
364+
> **NOTE**: Any FiftyOne SDK less than 2.20.0
361365
> will lose connectivity at this point.
362-
> Upgrading to `fiftyone==2.19.0` is required.
366+
> Upgrading to `fiftyone==2.20.0` is required.
363367

364368
```shell
365369
FIFTYONE_DATABASE_ADMIN=true fiftyone migrate --all
@@ -373,7 +377,7 @@ Additionally,
373377

374378
### From FiftyOne Enterprise Version 1.1.0 and Before Version 1.6.0
375379

376-
> **NOTE**: Upgrading to FiftyOne Enterprise v2.19.0 _requires_
380+
> **NOTE**: Upgrading to FiftyOne Enterprise v2.20.0 _requires_
377381
> your users to log in after the upgrade is complete.
378382
> This will interrupt active workflows in the FiftyOne Enterprise Hosted Web App.
379383
> You should coordinate this upgrade carefully with your end-users.
@@ -391,7 +395,7 @@ Additionally,
391395

392396
---
393397

394-
> **NOTE**: Upgrading to FiftyOne Enterprise v2.19.0 _requires_ a license file.
398+
> **NOTE**: Upgrading to FiftyOne Enterprise v2.20.0 _requires_ a license file.
395399
> Please contact your Customer Success Team before upgrading to FiftyOne Enterprise
396400
> 2.0 or beyond.
397401
>
@@ -443,15 +447,15 @@ Additionally,
443447
unset FIFTYONE_DATABASE_ADMIN
444448
```
445449

446-
1. [Upgrade to FiftyOne Enterprise version 2.19.0](#upgrading-from-previous-versions)
447-
1. Upgrade FiftyOne Enterprise SDK users to FiftyOne Enterprise version 2.19.0
450+
1. [Upgrade to FiftyOne Enterprise version 2.20.0](#upgrading-from-previous-versions)
451+
1. Upgrade FiftyOne Enterprise SDK users to FiftyOne Enterprise version 2.20.0
448452
1. Login to the FiftyOne Enterprise UI
449453
1. To obtain the CLI command to install the FiftyOne SDK associated with
450454
your FiftyOne Enterprise version, navigate to `Account > Install FiftyOne`
451455
1. Upgrade all the datasets
452-
> **NOTE**: Any FiftyOne SDK less than 2.19.0
456+
> **NOTE**: Any FiftyOne SDK less than 2.20.0
453457
> will lose connectivity at this point.
454-
> Upgrading to `fiftyone==2.19.0` is required.
458+
> Upgrading to `fiftyone==2.20.0` is required.
455459

456460
```shell
457461
FIFTYONE_DATABASE_ADMIN=true fiftyone migrate --all
@@ -482,14 +486,14 @@ Additionally,
482486

483487
---
484488

485-
> **NOTE**: Upgrading to FiftyOne Enterprise v2.19.0 _requires_ your users to
489+
> **NOTE**: Upgrading to FiftyOne Enterprise v2.20.0 _requires_ your users to
486490
> log in after the upgrade is complete.
487491
> This will interrupt active workflows in the FiftyOne Enterprise Hosted Web App.
488492
> You should coordinate this upgrade carefully with your end-users.
489493

490494
---
491495

492-
> **NOTE**: Upgrading to FiftyOne Enterprise v2.19.0 _requires_ a license file.
496+
> **NOTE**: Upgrading to FiftyOne Enterprise v2.20.0 _requires_ a license file.
493497
> Please contact your Customer Success Team before upgrading to FiftyOne Enterprise
494498
> 2.0 or beyond.
495499
>
@@ -520,13 +524,13 @@ Additionally,
520524
1. Update your web server routes to include routing
521525
`/cas/*` traffic to the `teams-cas` service.
522526
Please see our [example nginx configurations](../) for more information.
523-
1. [Upgrade to FiftyOne Enterprise v2.19.0](#upgrading-from-previous-versions)
527+
1. [Upgrade to FiftyOne Enterprise v2.20.0](#upgrading-from-previous-versions)
524528
with `FIFTYONE_DATABASE_ADMIN=true`
525529
(this is not the default for this release).
526530
> **NOTE**: FiftyOne SDK users will lose access to the FiftyOne
527-
> Enterprise Database at this step until they upgrade to `fiftyone==2.19.0`
531+
> Enterprise Database at this step until they upgrade to `fiftyone==2.20.0`
528532

529-
1. Upgrade your FiftyOne SDKs to version 2.19.0
533+
1. Upgrade your FiftyOne SDKs to version 2.20.0
530534
1. Login to the FiftyOne Enterprise UI
531535
1. To obtain the CLI command to install the FiftyOne SDK associated
532536
with your FiftyOne Enterprise version, navigate to

docker/internal-auth/compose.delegated-operators.gpu.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# https://github.com/voxel51/fiftyone-teams-app-deploy/tree/main/docker#environment-proxies
2020
services:
2121
teams-do-gpu:
22-
image: voxel51/fiftyone-teams-cv-full:v2.19.0
22+
image: voxel51/fiftyone-teams-cv-full:v2.20.0
2323
profiles: ["gpu"]
2424
shm_size: "8g"
2525
command: >
@@ -51,7 +51,7 @@ services:
5151
restart: always
5252

5353
teams-do-gpu-telemetry:
54-
image: voxel51/telemetry-sidecar:v2.19.0
54+
image: voxel51/telemetry-sidecar:v2.20.0
5555
pid: "service:teams-do-gpu"
5656
profiles: ["gpu"]
5757
user: "1000:1000"

docker/internal-auth/compose.delegated-operators.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
# distinct orchestrator name so it surfaces separately in the
2929
# Settings → Metrics UI.
3030
teams-do-2:
31-
image: voxel51/fiftyone-teams-cv-full:v2.19.0
31+
image: voxel51/fiftyone-teams-cv-full:v2.20.0
3232
profiles: ["do-2", "do-3"]
3333
deploy:
3434
replicas: 1
@@ -51,7 +51,7 @@ services:
5151
- telemetry-socket-2:/tmp/telemetry
5252

5353
teams-do-2-telemetry:
54-
image: voxel51/telemetry-sidecar:v2.19.0
54+
image: voxel51/telemetry-sidecar:v2.20.0
5555
profiles: ["do-2", "do-3"]
5656
pid: "service:teams-do-2"
5757
user: "1000:1000"
@@ -92,7 +92,7 @@ services:
9292
# Slot 3 — included by the `do-3` profile. Mirror of slot 2 with its
9393
# own socket volume and orchestrator name.
9494
teams-do-3:
95-
image: voxel51/fiftyone-teams-cv-full:v2.19.0
95+
image: voxel51/fiftyone-teams-cv-full:v2.20.0
9696
profiles: ["do-3"]
9797
deploy:
9898
replicas: 1
@@ -115,7 +115,7 @@ services:
115115
- telemetry-socket-3:/tmp/telemetry
116116

117117
teams-do-3-telemetry:
118-
image: voxel51/telemetry-sidecar:v2.19.0
118+
image: voxel51/telemetry-sidecar:v2.20.0
119119
profiles: ["do-3"]
120120
pid: "service:teams-do-3"
121121
user: "1000:1000"

docker/legacy-auth/compose.delegated-operators.gpu.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# https://github.com/voxel51/fiftyone-teams-app-deploy/tree/main/docker#environment-proxies
2020
services:
2121
teams-do-gpu:
22-
image: voxel51/fiftyone-teams-cv-full:v2.19.0
22+
image: voxel51/fiftyone-teams-cv-full:v2.20.0
2323
profiles: ["gpu"]
2424
shm_size: "8g"
2525
command: >
@@ -51,7 +51,7 @@ services:
5151
restart: always
5252

5353
teams-do-gpu-telemetry:
54-
image: voxel51/telemetry-sidecar:v2.19.0
54+
image: voxel51/telemetry-sidecar:v2.20.0
5555
pid: "service:teams-do-gpu"
5656
profiles: ["gpu"]
5757
user: "1000:1000"

docker/legacy-auth/compose.delegated-operators.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
# distinct orchestrator name so it surfaces separately in the
2929
# Settings → Metrics UI.
3030
teams-do-2:
31-
image: voxel51/fiftyone-teams-cv-full:v2.19.0
31+
image: voxel51/fiftyone-teams-cv-full:v2.20.0
3232
profiles: ["do-2", "do-3"]
3333
deploy:
3434
replicas: 1
@@ -51,7 +51,7 @@ services:
5151
- telemetry-socket-2:/tmp/telemetry
5252

5353
teams-do-2-telemetry:
54-
image: voxel51/telemetry-sidecar:v2.19.0
54+
image: voxel51/telemetry-sidecar:v2.20.0
5555
profiles: ["do-2", "do-3"]
5656
pid: "service:teams-do-2"
5757
user: "1000:1000"
@@ -94,7 +94,7 @@ services:
9494
# for higher worker counts use the helm chart, which adds a sidecar
9595
# to every pod automatically.
9696
teams-do-3:
97-
image: voxel51/fiftyone-teams-cv-full:v2.19.0
97+
image: voxel51/fiftyone-teams-cv-full:v2.20.0
9898
profiles: ["do-3"]
9999
deploy:
100100
replicas: 1
@@ -117,7 +117,7 @@ services:
117117
- telemetry-socket-3:/tmp/telemetry
118118

119119
teams-do-3-telemetry:
120-
image: voxel51/telemetry-sidecar:v2.19.0
120+
image: voxel51/telemetry-sidecar:v2.20.0
121121
profiles: ["do-3"]
122122
pid: "service:teams-do-3"
123123
user: "1000:1000"

0 commit comments

Comments
 (0)