Skip to content

Commit

Permalink
Merge pull request #164 from voxel51/release/v1.7.1
Browse files Browse the repository at this point in the history
Release/v1.7.1
  • Loading branch information
findtopher authored Jun 11, 2024
2 parents 6371187 + 85f9e36 commit c43c641
Show file tree
Hide file tree
Showing 20 changed files with 130 additions and 171 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
token_format: access_token
workload_identity_provider: ${{ secrets.ORG_GOOGLE_WORKLOAD_IDP }}
- name: Login to GAR
uses: docker/login-action@v3.1.0
uses: docker/login-action@v3.2.0
with:
registry: us-central1-docker.pkg.dev
username: oauth2accesstoken
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
token_format: access_token
workload_identity_provider: ${{ secrets.ORG_GOOGLE_WORKLOAD_IDP }}
- name: Login to GAR
uses: docker/login-action@v3.1.0
uses: docker/login-action@v3.2.0
with:
registry: us-central1-docker.pkg.dev
username: oauth2accesstoken
Expand Down
4 changes: 0 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,3 @@ repos:
args:
- -w
- -s
- repo: https://github.com/rhysd/actionlint
rev: v1.7.0
hooks:
- id: actionlint
18 changes: 9 additions & 9 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
cmctl 1.13.3
golang 1.21.6
helm 3.13.2
helm-docs 1.11.3
kubectl 1.27.4
minikube 1.32.0
pre-commit 3.5.0
cmctl 1.14.4
golang 1.22.3
helm 3.15.1
helm-docs 1.13.1
kubectl 1.30.1
minikube 1.33.1
pre-commit 3.7.1
shellcheck 0.10.0
shfmt 3.7.0
skaffold 2.10.0
shfmt 3.8.0
skaffold 2.12.0
17 changes: 10 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SHELL := $(SHELL) -e
ASDF := $(shell asdf where golang)
VERSION ?= 1.7.0
VERSION ?= 1.7.1

# Help
.PHONY: $(shell sed -n -e '/^$$/ { n ; /^[^ .\#][^ ]*:/ { s/:.*$$// ; p ; } ; }' $(MAKEFILE_LIST))
Expand Down Expand Up @@ -79,10 +79,10 @@ delete: ## Delete minikube
minikube delete

dev: helm-repos ## run skaffold dev
skaffold dev
skaffold dev --kube-context minikube

dev-keep: helm-repos ## run skaffold dev with keep-runining-on-failure
skaffold dev --keep-running-on-failure
skaffold dev --keep-running-on-failure --kube-context minikube

port-forward-app: ## port forward the service `teams-app` on the host port 3000
kubectl port-forward --namespace fiftyone-teams svc/teams-app 3000:80 --context minikube
Expand All @@ -94,18 +94,21 @@ port-forward-mongo: ## port forward to service `mongodb` on the host port 27017
kubectl port-forward --namespace fiftyone-teams svc/mongodb 27017:27017 --context minikube

run: helm-repos ## run skaffold run
skaffold run
skaffold run --kube-context minikube

run-cert-manager: helm-repos ## run skaffold run
skaffold run \
--filename skaffold-cert-manager.yaml
--filename skaffold-cert-manager.yaml \
--kube-context minikube

run-mongodb: helm-repos ## run skaffold run
skaffold run \
--filename skaffold-mongodb.yaml
--filename skaffold-mongodb.yaml \
--kube-context minikube

run-profile-only-fiftyone: helm-repos ## run skaffold run -p only-fiftyone
skaffold run -p only-fiftyone
skaffold run -p only-fiftyone \
--kube-context minikube

tunnel: ## run minikube tunnel to access the k8s ingress via localhost ()
sudo minikube tunnel &> /dev/null &
Expand Down
34 changes: 17 additions & 17 deletions docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</div>
<!-- markdownlint-enable no-inline-html line-length -->

## Known Issue for FiftyOne Teams v1.6.0 and Above
## Known Issues for FiftyOne Teams v1.6.0 and Above

### "Install Fiftyone" Instructions Missing PyPI Token

Expand All @@ -35,7 +35,7 @@ something like the following to your `compose.override.yaml`:
```yaml
teams-app:
environment:
FIFTYONE_APP_INSTALL_FIFTYONE_OVERRIDE: pip install -U --index-url https://<your PyPI Token>@pypi.fiftyone.ai fiftyone==0.17.0
FIFTYONE_APP_INSTALL_FIFTYONE_OVERRIDE: pip install -U --index-url https://<your PyPI Token>@pypi.fiftyone.ai fiftyone==0.17.1
```
If you need your PyPI token, please contact your Customer Success representative
Expand Down Expand Up @@ -449,7 +449,7 @@ For example, `compose.override.yaml` might look like:
```yaml
services:
fiftyone-app:
image: voxel51/fiftyone-app-torch:v1.7.0
image: voxel51/fiftyone-app-torch:v1.7.1
```

For more information, see the docs for
Expand Down Expand Up @@ -487,7 +487,7 @@ modify your existing configuration to migrate to a new Auth0 Tenant.

---

> **NOTE**: Upgrading to FiftyOne Teams v1.7.0 _requires_
> **NOTE**: Upgrading to FiftyOne Teams v1.7.1 _requires_
> your users to log in after the upgrade is complete.
> This will interrupt active workflows in the FiftyOne Teams Hosted Web App.
> You should coordinate this upgrade carefully with your end-users.
Expand All @@ -503,13 +503,13 @@ modify your existing configuration to migrate to a new Auth0 Tenant.
`/cas/*` traffic to the `teams-cas` service.
Example nginx configurations can be found
[here](https://github.com/voxel51/fiftyone-teams-app-deploy/tree/main/docker)
1. [Upgrade to FiftyOne Teams v1.7.0](#deploying-fiftyone-teams)
1. [Upgrade to FiftyOne Teams v1.7.1](#deploying-fiftyone-teams)
with `FIFTYONE_DATABASE_ADMIN=true`
(this is not the default for this release).
> **NOTE**: FiftyOne SDK users will lose access to the FiftyOne
> Teams Database at this step until they upgrade to `fiftyone==0.17.0`
> Teams Database at this step until they upgrade to `fiftyone==0.17.1`

1. Upgrade your FiftyOne SDKs to version 0.17.0
1. Upgrade your FiftyOne SDKs to version 0.17.1
- Login to the FiftyOne Teams UI
- To obtain the CLI command to install the FiftyOne SDK associated
with your FiftyOne Teams version, navigate to
Expand All @@ -528,7 +528,7 @@ modify your existing configuration to migrate to a new Auth0 Tenant.

### From FiftyOne Teams Version 1.1.0 and Before Version 1.6.0

> **NOTE**: Upgrading to FiftyOne Teams v1.7.0 _requires_
> **NOTE**: Upgrading to FiftyOne Teams v1.7.1 _requires_
> your users to log in after the upgrade is complete.
> This will interrupt active workflows in the FiftyOne Teams Hosted Web App.
> You should coordinate this upgrade carefully with your end-users.
Expand Down Expand Up @@ -575,15 +575,15 @@ modify your existing configuration to migrate to a new Auth0 Tenant.
unset FIFTYONE_DATABASE_ADMIN
```

1. [Upgrade to FiftyOne Teams version 1.7.0](#deploying-fiftyone-teams)
1. Upgrade FiftyOne Teams SDK users to FiftyOne Teams version 0.17.0
1. [Upgrade to FiftyOne Teams version 1.7.1](#deploying-fiftyone-teams)
1. Upgrade FiftyOne Teams SDK users to FiftyOne Teams version 0.17.1
- Login to the FiftyOne Teams UI
- To obtain the CLI command to install the FiftyOne SDK associated with
your FiftyOne Teams version, navigate to `Account > Install FiftyOne`
1. Upgrade all the datasets
> **NOTE** Any FiftyOne SDK less than 0.17.0
> **NOTE** Any FiftyOne SDK less than 0.17.1
> will lose connectivity at this point.
> Upgrading to `fiftyone==0.17.0` is required.
> Upgrading to `fiftyone==0.17.1` is required.

```shell
FIFTYONE_DATABASE_ADMIN=true fiftyone migrate --all
Expand Down Expand Up @@ -611,8 +611,8 @@ modify your existing configuration to migrate to a new Auth0 Tenant.
unset FIFTYONE_DATABASE_ADMIN
```

1. [Upgrade to FiftyOne Teams version 1.7.0](#deploying-fiftyone-teams)
1. Upgrade FiftyOne Teams SDK users to FiftyOne Teams version 0.17.0
1. [Upgrade to FiftyOne Teams version 1.7.1](#deploying-fiftyone-teams)
1. Upgrade FiftyOne Teams SDK users to FiftyOne Teams version 0.17.1
- Login to the FiftyOne Teams UI
- To obtain the CLI command to install the FiftyOne SDK associated with
your FiftyOne Teams version, navigate to `Account > Install FiftyOne`
Expand All @@ -622,8 +622,8 @@ modify your existing configuration to migrate to a new Auth0 Tenant.
FIFTYONE_DATABASE_ADMIN=true fiftyone migrate --all
```

- **NOTE** Any FiftyOne SDK less than 0.17.0 will lose database connectivity
at this point. Upgrading to `fiftyone==0.17.0` is required
- **NOTE** Any FiftyOne SDK less than 0.17.1 will lose database connectivity
at this point. Upgrading to `fiftyone==0.17.1` is required

1. To ensure that all datasets are now at version 0.24.0, run

Expand Down Expand Up @@ -760,4 +760,4 @@ for an example Nginx site configuration that forwards

<!-- Reference Links -->
[internal-auth-mode]: https://docs.voxel51.com/teams/pluggable_auth.html#internal-mode
[legacy-auth-mode]: topher/document-install-modal-override
[legacy-auth-mode]: https://docs.voxel51.com/teams/pluggable_auth.html#legacy-mode
12 changes: 6 additions & 6 deletions docker/common-services.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
services:
fiftyone-app-common:
image: voxel51/fiftyone-app:v1.7.0
image: voxel51/fiftyone-app:v1.7.1
environment:
API_URL: ${API_URL}
FIFTYONE_AUTH_SECRET: ${FIFTYONE_AUTH_SECRET}
Expand Down Expand Up @@ -30,7 +30,7 @@ services:
restart: always

teams-api-common:
image: voxel51/fiftyone-teams-api:v1.7.0
image: voxel51/fiftyone-teams-api:v1.7.1
environment:
CAS_BASE_URL: ${CAS_BASE_URL:-http://teams-cas:3000/cas/api}
FIFTYONE_AUTH_SECRET: ${FIFTYONE_AUTH_SECRET}
Expand All @@ -57,14 +57,14 @@ services:
restart: always

teams-app-common:
image: voxel51/fiftyone-teams-app:v1.7.0
image: voxel51/fiftyone-teams-app:v1.7.1
environment:
API_URL: ${API_URL}
APP_USE_HTTPS: ${APP_USE_HTTPS:-true}
FEATURE_FLAG_ENABLE_INVITATIONS: false
FIFTYONE_API_URI: ${FIFTYONE_API_URI:-"Please contact your Admin for an API URI"}
FIFTYONE_APP_ALLOW_MEDIA_EXPORT: ${FIFTYONE_APP_ALLOW_MEDIA_EXPORT:-true}
FIFTYONE_APP_TEAMS_SDK_RECOMMENDED_VERSION: 0.17.0
FIFTYONE_APP_TEAMS_SDK_RECOMMENDED_VERSION: 0.17.1
FIFTYONE_AUTH_SECRET: ${FIFTYONE_AUTH_SECRET}
FIFTYONE_SERVER_ADDRESS: ""
FIFTYONE_SERVER_PATH_PREFIX: /api/proxy/fiftyone-teams
Expand All @@ -90,7 +90,7 @@ services:
restart: always

teams-cas-common:
image: voxel51/fiftyone-teams-cas:v1.7.0
image: voxel51/fiftyone-teams-cas:v1.7.1
environment:
CAS_DATABASE_NAME: ${CAS_DATABASE_NAME:-cas}
CAS_DEFAULT_USER_ROLE: ${CAS_DEFAULT_USER_ROLE:-GUEST}
Expand All @@ -116,7 +116,7 @@ services:
restart: always

teams-plugins-common:
image: voxel51/fiftyone-app:v1.7.0
image: voxel51/fiftyone-app:v1.7.1
environment:
API_URL: ${API_URL}
FIFTYONE_AUTH_SECRET: ${FIFTYONE_AUTH_SECRET}
Expand Down
4 changes: 2 additions & 2 deletions docs/custom-plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ With a Dockerfile like this, you could use the following commands to
build, and publish, your image to your internal registry

```shell
TEAMS_VERSION=v1.7.0
TEAMS_VERSION=v1.7.1
docker buildx build --push \
--build-arg TEAMS_IMAGE_NAME='voxel51/fiftyone-app:${TEAMS_VERSION}' \
-t your-internal-registry/fiftyone-app-internal:${TEAMS_VERSION} .
Expand All @@ -63,7 +63,7 @@ After your custom plugins image is built, you can add it to your
```yaml
services:
teams-plugins:
image: your-internal-registry/fiftyone-app-internal:v1.7.0
image: your-internal-registry/fiftyone-app-internal:v1.7.1
```
Please see
Expand Down
4 changes: 2 additions & 2 deletions helm/fiftyone-teams-app/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ name: fiftyone-teams-app
namespace: fiftyone-teams
description: FiftyOne Teams is the enterprise version of the open source [FiftyOne](https://github.com/voxel51/fiftyone) project.
type: application
version: 1.7.0
appVersion: "v1.7.0"
version: 1.7.1
appVersion: "v1.7.1"
icon: https://voxel51.com/images/logo/voxel51-logo-horz-color-600dpi.png
Loading

0 comments on commit c43c641

Please sign in to comment.