Skip to content

Commit ff5781b

Browse files
ci(release): Automated merge from release/v2.16.1 workflow
Release/v2.16.1
2 parents d71f200 + 9775b30 commit ff5781b

25 files changed

Lines changed: 328 additions & 114 deletions

.github/workflows/test-docker.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ jobs:
4848
runs-on: ubuntu-latest
4949
steps:
5050
- uses: actions/checkout@v6
51+
- name: Free Disk Space (Ubuntu) # standard runner's 14 GB available disk size isn't enough. Need at least 22 GB free.
52+
uses: jlumbroso/free-disk-space@v1.3.1
5153
- name: Checkout voxel51/aloha-github-workflows
5254
uses: actions/checkout@v6
5355
with:
@@ -103,6 +105,8 @@ jobs:
103105
runs-on: ubuntu-latest
104106
steps:
105107
- uses: actions/checkout@v6
108+
- name: Free Disk Space (Ubuntu) # standard runner's 14 GB available disk size isn't enough. Need at least 22 GB free.
109+
uses: jlumbroso/free-disk-space@v1.3.1
106110
- name: Checkout voxel51/aloha-github-workflows
107111
uses: actions/checkout@v6
108112
with:

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.16.0
3+
VERSION ?= 2.16.1
44

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

docker/README.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ You can override the default image used by any service in
233233
```yaml
234234
services:
235235
fiftyone-app:
236-
image: voxel51/fiftyone-app-torch:v2.16.0
236+
image: voxel51/fiftyone-app-torch:v2.16.1
237237
```
238238

239239
## :rocket: Step 4: Initial Deployment
@@ -312,14 +312,16 @@ These proxies will:
312312

313313
### :compass: Routing Overview (Path-Based Proxy)
314314

315-
| Path | Proxied To | Description |
316-
| ------------- | ----------- | ------------------------------------ |
317-
| `/` | `teams-app` | Main web UI |
318-
| `/cas` | `teams-cas` | Central Authentication Service (CAS) |
319-
| `/graphql/v1` | `teams-api` | GraphQL API endpoint |
320-
| `/file` | `teams-api` | File import handling |
321-
| `/_pymongo` | `teams-api` | MongoDB requests via SDK |
322-
| `/health` | `teams-api` | Health check endpoint |
315+
| Path | Proxied To | Description |
316+
|----------------------| ----------- |--------------------------------------|
317+
| `/` | `teams-app` | Main web UI |
318+
| `/cas` | `teams-cas` | Central Authentication Service (CAS) |
319+
| `/cloud_credentials` | `teams-api` | Cloud credentials API endpoint |
320+
| `/graphql/v1` | `teams-api` | GraphQL API endpoint |
321+
| `/rpc` | `teams-api` | RPC API endpoint |
322+
| `/file` | `teams-api` | File import handling |
323+
| `/_pymongo` | `teams-api` | MongoDB requests via SDK |
324+
| `/health` | `teams-api` | Health check endpoint |
323325

324326
### :open_file_folder: Nginx Configuration Options
325327

docker/common-services.yaml

Lines changed: 7 additions & 7 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.16.0
4+
image: voxel51/fiftyone-app:v2.16.1
55
environment:
66
API_URL: ${API_URL}
77
FIFTYONE_APP_DEFAULT_QUERY_PERFORMANCE: ${FIFTYONE_APP_DEFAULT_QUERY_PERFORMANCE}
@@ -32,7 +32,7 @@ services:
3232
restart: always
3333

3434
teams-api-common:
35-
image: voxel51/fiftyone-teams-api:v2.16.0
35+
image: voxel51/fiftyone-teams-api:v2.16.1
3636
environment:
3737
API_EXTERNAL_URL: ${FIFTYONE_API_URI}
3838
CAS_BASE_URL: ${CAS_BASE_URL:-http://teams-cas:3000/cas/api}
@@ -61,13 +61,13 @@ services:
6161
restart: always
6262

6363
teams-app-common:
64-
image: voxel51/fiftyone-teams-app:v2.16.0
64+
image: voxel51/fiftyone-teams-app:v2.16.1
6565
environment:
6666
API_URL: ${API_URL}
6767
APP_USE_HTTPS: ${APP_USE_HTTPS:-true}
6868
FIFTYONE_API_URI: ${FIFTYONE_API_URI:-"Please contact your Admin for an API URI"}
6969
FIFTYONE_APP_ALLOW_MEDIA_EXPORT: ${FIFTYONE_APP_ALLOW_MEDIA_EXPORT:-true}
70-
FIFTYONE_APP_TEAMS_SDK_RECOMMENDED_VERSION: 2.16.0
70+
FIFTYONE_APP_TEAMS_SDK_RECOMMENDED_VERSION: 2.16.1
7171
FIFTYONE_AUTH_SECRET: ${FIFTYONE_AUTH_SECRET}
7272
FIFTYONE_SERVER_ADDRESS: ""
7373
FIFTYONE_SERVER_PATH_PREFIX: /api/proxy/fiftyone-teams
@@ -94,7 +94,7 @@ services:
9494
restart: always
9595

9696
teams-cas-common:
97-
image: voxel51/fiftyone-teams-cas:v2.16.0
97+
image: voxel51/fiftyone-teams-cas:v2.16.1
9898
environment:
9999
CAS_DATABASE_NAME: ${CAS_DATABASE_NAME:-cas}
100100
CAS_DEFAULT_USER_ROLE: ${CAS_DEFAULT_USER_ROLE:-GUEST}
@@ -129,7 +129,7 @@ services:
129129
read_only: true
130130

131131
teams-plugins-common:
132-
image: voxel51/fiftyone-app-torch:v2.16.0
132+
image: voxel51/fiftyone-app-torch:v2.16.1
133133
environment:
134134
API_URL: ${API_URL}
135135
FIFTYONE_AUTH_SECRET: ${FIFTYONE_AUTH_SECRET}
@@ -156,7 +156,7 @@ services:
156156
restart: always
157157

158158
teams-do-common:
159-
image: voxel51/fiftyone-teams-cv-full:v2.16.0
159+
image: voxel51/fiftyone-teams-cv-full:v2.16.1
160160
deploy:
161161
replicas: ${FIFTYONE_DELEGATED_OPERATOR_WORKER_REPLICAS:-3}
162162
command: >

docker/docs/configuring-gpu-workloads.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ services:
6565
service: teams-do-common
6666

6767
teams-do-with-gpu:
68-
image: voxel51/fiftyone-teams-cv-full:v2.16.0
68+
image: voxel51/fiftyone-teams-cv-full:v2.16.1
6969
command: >
7070
/bin/sh -c "fiftyone delegated launch -t remote -n 'teams-do-with-gpu' -m"
7171
environment:

docker/docs/upgrading.md

Lines changed: 73 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
- [Upgrading From Previous Versions](#upgrading-from-previous-versions)
2020
- [A Note On Database Migrations](#a-note-on-database-migrations)
2121
- [From FiftyOne Enterprise Version 2.0.0 and Later](#from-fiftyone-enterprise-version-200-and-later)
22+
- [FiftyOne Enterprise v2.16+ Additional API Routes](#fiftyone-enterprise-v216-additional-api-routes)
23+
- [FiftyOne Enterprise v2.15+ Additional API Routes](#fiftyone-enterprise-v215-additional-api-routes)
2224
- [FiftyOne Enterprise v2.7+ Delegated Operator Changes](#fiftyone-enterprise-v27-delegated-operator-changes)
2325
- [FiftyOne Enterprise v2.5+ Delegated Operator Changes](#fiftyone-enterprise-v25-delegated-operator-changes)
2426
- [FiftyOne Enterprise v2.2+ Delegated Operator Changes](#fiftyone-enterprise-v22-delegated-operator-changes)
@@ -78,9 +80,9 @@ quickstart 0.21.2
7880

7981
### From FiftyOne Enterprise Version 2.0.0 and Later
8082

81-
1. [Upgrade to FiftyOne Enterprise version 2.16.0](#upgrading-from-previous-versions)
83+
1. [Upgrade to FiftyOne Enterprise version 2.16.1](#upgrading-from-previous-versions)
8284
1. Voxel51 recommends upgrading all FiftyOne Enterprise SDK users to FiftyOne Enterprise
83-
version 2.16.0
85+
version 2.16.1
8486
1. Login to the FiftyOne Enterprise UI
8587
1. To obtain the CLI command to install the FiftyOne SDK associated with
8688
your FiftyOne Enterprise version, navigate to `Account > Install FiftyOne`
@@ -96,6 +98,58 @@ quickstart 0.21.2
9698
fiftyone migrate --info
9799
```
98100

101+
#### FiftyOne Enterprise v2.16+ Additional API Routes
102+
103+
FiftyOne Enterprise v2.16.0 adds the `/cloud_credentials` endpoint to the `teams-api`.
104+
If using path-based routing, please update your Nginx configuration to
105+
include this endpoint:
106+
107+
```nginx
108+
server {
109+
server_name your.server.name;
110+
111+
# existing configuration
112+
113+
location /cloud_credentials {
114+
proxy_pass http://teams-api;
115+
proxy_set_header Upgrade $http_upgrade;
116+
proxy_set_header Connection "Upgrade";
117+
}
118+
119+
# existing configuration
120+
}
121+
```
122+
123+
Please see the
124+
[ingress documentation](https://github.com/voxel51/fiftyone-teams-app-deploy/blob/main/docker/docs/expose-teams-api.md)
125+
for full details.
126+
127+
#### FiftyOne Enterprise v2.15+ Additional API Routes
128+
129+
FiftyOne Enterprise v2.15.0 adds the `/rpc` endpoints to the `teams-api`.
130+
If using path-based routing, please update your Nginx configuration to
131+
include these endpoints:
132+
133+
```nginx
134+
server {
135+
server_name your.server.name;
136+
137+
# existing configuration
138+
139+
location /rpc {
140+
proxy_pass http://teams-api;
141+
proxy_set_header Upgrade $http_upgrade;
142+
proxy_set_header Connection "Upgrade";
143+
}
144+
145+
# existing configuration
146+
}
147+
```
148+
149+
Please see the
150+
[ingress documentation](https://github.com/voxel51/fiftyone-teams-app-deploy/blob/main/docker/docs/expose-teams-api.md)
151+
for full details.
152+
99153
#### FiftyOne Enterprise v2.7+ Delegated Operator Changes
100154

101155
FiftyOne Enterprise v2.7.0 changes the `FIFTYONE_DELEGATED_OPERATION_RUN_LINK_PATH`
@@ -121,7 +175,7 @@ To utilize the prior image, update your `common-services.yaml` similar to the be
121175

122176
```yaml
123177
teams-do-common:
124-
image: voxel51/fiftyone-app:v2.16.0
178+
image: voxel51/fiftyone-app:v2.16.1
125179
```
126180
127181
#### FiftyOne Enterprise v2.2+ Delegated Operator Changes
@@ -156,7 +210,7 @@ Additionally,
156210

157211
### From FiftyOne Enterprise Versions 1.6.0 to 1.7.1
158212

159-
> **NOTE**: Upgrading to FiftyOne Enterprise v2.16.0 _requires_ a license file.
213+
> **NOTE**: Upgrading to FiftyOne Enterprise v2.16.1 _requires_ a license file.
160214
> Please contact your Customer Success Team before upgrading to FiftyOne Enterprise
161215
> 2.0 or beyond.
162216
>
@@ -191,15 +245,15 @@ Additionally,
191245
mv license.key "${LOCAL_LICENSE_FILE_DIR}/license"
192246
```
193247

194-
1. [Upgrade to FiftyOne Enterprise version 2.16.0](#upgrading-from-previous-versions)
195-
1. Upgrade FiftyOne Enterprise SDK users to FiftyOne Enterprise version 2.16.0
248+
1. [Upgrade to FiftyOne Enterprise version 2.16.1](#upgrading-from-previous-versions)
249+
1. Upgrade FiftyOne Enterprise SDK users to FiftyOne Enterprise version 2.16.1
196250
1. Login to the FiftyOne Enterprise UI
197251
1. To obtain the CLI command to install the FiftyOne SDK associated with
198252
your FiftyOne Enterprise version, navigate to `Account > Install FiftyOne`
199253
1. Upgrade all the datasets
200-
> **NOTE**: Any FiftyOne SDK less than 2.16.0
254+
> **NOTE**: Any FiftyOne SDK less than 2.16.1
201255
> will lose connectivity at this point.
202-
> Upgrading to `fiftyone==2.16.0` is required.
256+
> Upgrading to `fiftyone==2.16.1` is required.
203257

204258
```shell
205259
FIFTYONE_DATABASE_ADMIN=true fiftyone migrate --all
@@ -213,7 +267,7 @@ Additionally,
213267

214268
### From FiftyOne Enterprise Version 1.1.0 and Before Version 1.6.0
215269

216-
> **NOTE**: Upgrading to FiftyOne Enterprise v2.16.0 _requires_
270+
> **NOTE**: Upgrading to FiftyOne Enterprise v2.16.1 _requires_
217271
> your users to log in after the upgrade is complete.
218272
> This will interrupt active workflows in the FiftyOne Enterprise Hosted Web App.
219273
> You should coordinate this upgrade carefully with your end-users.
@@ -231,7 +285,7 @@ Additionally,
231285

232286
---
233287

234-
> **NOTE**: Upgrading to FiftyOne Enterprise v2.16.0 _requires_ a license file.
288+
> **NOTE**: Upgrading to FiftyOne Enterprise v2.16.1 _requires_ a license file.
235289
> Please contact your Customer Success Team before upgrading to FiftyOne Enterprise
236290
> 2.0 or beyond.
237291
>
@@ -283,15 +337,15 @@ Additionally,
283337
unset FIFTYONE_DATABASE_ADMIN
284338
```
285339

286-
1. [Upgrade to FiftyOne Enterprise version 2.16.0](#upgrading-from-previous-versions)
287-
1. Upgrade FiftyOne Enterprise SDK users to FiftyOne Enterprise version 2.16.0
340+
1. [Upgrade to FiftyOne Enterprise version 2.16.1](#upgrading-from-previous-versions)
341+
1. Upgrade FiftyOne Enterprise SDK users to FiftyOne Enterprise version 2.16.1
288342
1. Login to the FiftyOne Enterprise UI
289343
1. To obtain the CLI command to install the FiftyOne SDK associated with
290344
your FiftyOne Enterprise version, navigate to `Account > Install FiftyOne`
291345
1. Upgrade all the datasets
292-
> **NOTE**: Any FiftyOne SDK less than 2.16.0
346+
> **NOTE**: Any FiftyOne SDK less than 2.16.1
293347
> will lose connectivity at this point.
294-
> Upgrading to `fiftyone==2.16.0` is required.
348+
> Upgrading to `fiftyone==2.16.1` is required.
295349

296350
```shell
297351
FIFTYONE_DATABASE_ADMIN=true fiftyone migrate --all
@@ -322,14 +376,14 @@ Additionally,
322376

323377
---
324378

325-
> **NOTE**: Upgrading to FiftyOne Enterprise v2.16.0 _requires_ your users to
379+
> **NOTE**: Upgrading to FiftyOne Enterprise v2.16.1 _requires_ your users to
326380
> log in after the upgrade is complete.
327381
> This will interrupt active workflows in the FiftyOne Enterprise Hosted Web App.
328382
> You should coordinate this upgrade carefully with your end-users.
329383

330384
---
331385

332-
> **NOTE**: Upgrading to FiftyOne Enterprise v2.16.0 _requires_ a license file.
386+
> **NOTE**: Upgrading to FiftyOne Enterprise v2.16.1 _requires_ a license file.
333387
> Please contact your Customer Success Team before upgrading to FiftyOne Enterprise
334388
> 2.0 or beyond.
335389
>
@@ -360,13 +414,13 @@ Additionally,
360414
1. Update your web server routes to include routing
361415
`/cas/*` traffic to the `teams-cas` service.
362416
Please see our [example nginx configurations](../) for more information.
363-
1. [Upgrade to FiftyOne Enterprise v2.16.0](#upgrading-from-previous-versions)
417+
1. [Upgrade to FiftyOne Enterprise v2.16.1](#upgrading-from-previous-versions)
364418
with `FIFTYONE_DATABASE_ADMIN=true`
365419
(this is not the default for this release).
366420
> **NOTE**: FiftyOne SDK users will lose access to the FiftyOne
367-
> Enterprise Database at this step until they upgrade to `fiftyone==2.16.0`
421+
> Enterprise Database at this step until they upgrade to `fiftyone==2.16.1`
368422

369-
1. Upgrade your FiftyOne SDKs to version 2.16.0
423+
1. Upgrade your FiftyOne SDKs to version 2.16.1
370424
1. Login to the FiftyOne Enterprise UI
371425
1. To obtain the CLI command to install the FiftyOne SDK associated
372426
with your FiftyOne Enterprise version, navigate to

docker/example-nginx-path-routing.conf

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ server {
3030
proxy_set_header Connection "Upgrade";
3131
}
3232

33+
location /cloud_credentials {
34+
proxy_pass http://teams-api;
35+
proxy_set_header Upgrade $http_upgrade;
36+
proxy_set_header Connection "Upgrade";
37+
}
38+
3339
location /health {
3440
proxy_pass http://teams-api;
3541
proxy_set_header Upgrade $http_upgrade;
@@ -50,6 +56,12 @@ server {
5056
proxy_set_header Connection "Upgrade";
5157
}
5258

59+
location /rpc {
60+
proxy_pass http://teams-api;
61+
proxy_set_header Upgrade $http_upgrade;
62+
proxy_set_header Connection "Upgrade";
63+
}
64+
5365
location / {
5466
proxy_set_header Host $host;
5567
proxy_set_header X-Real-IP $remote_addr;

docs/custom-plugins.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ With a Dockerfile like this, you could use the following commands to
4646
build, and publish, your image to your internal registry
4747

4848
```shell
49-
FIFTYONE_ENTERPRISE_VERSION=v2.16.0
49+
FIFTYONE_ENTERPRISE_VERSION=v2.16.1
5050
docker buildx build --push \
5151
--build-arg FIFTYONE_ENTERPRISE_IMAGE_NAME="voxel51/fiftyone-app:${FIFTYONE_ENTERPRISE_VERSION}" \
5252
-t your-internal-registry/fiftyone-app-internal:${FIFTYONE_ENTERPRISE_VERSION} .
@@ -63,7 +63,7 @@ After your custom plugins image is built, you can add it to your
6363
```yaml
6464
services:
6565
teams-plugins:
66-
image: your-internal-registry/fiftyone-app-internal:v2.16.0
66+
image: your-internal-registry/fiftyone-app-internal:v2.16.1
6767
```
6868
6969
Please see

docs/orchestrators/configuring-databricks-orchestrator.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ w = WorkspaceClient()
8787
DBFS_PATH = "/FileStore/my_project/requirements.txt"
8888

8989
PYTHON_DEPENDENCIES = [
90-
"fiftyone==2.16.0", # use your FiftyOne version here
90+
"fiftyone==2.16.1", # use your FiftyOne version here
9191
"ultralytics",
9292
"torch",
9393
"transformers",

helm/docs/aws-deployment-guide.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,10 @@ ingress:
499499
pathType: Prefix
500500
serviceName: teams-api
501501
servicePort: 80
502+
- path: /cloud_credentials
503+
pathType: Prefix
504+
serviceName: teams-api
505+
servicePort: 80
502506
- path: /health
503507
pathType: Prefix
504508
serviceName: teams-api
@@ -507,6 +511,10 @@ ingress:
507511
pathType: Prefix
508512
serviceName: teams-api
509513
servicePort: 80
514+
- path: /rpc
515+
pathType: Prefix
516+
serviceName: teams-api
517+
servicePort: 80
510518
- path: /file
511519
pathType: Prefix
512520
serviceName: teams-api

0 commit comments

Comments
 (0)