diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml index c84c3ea9..d58c4825 100644 --- a/.github/workflows/test-docker.yml +++ b/.github/workflows/test-docker.yml @@ -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 @@ -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 diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 954be728..a0ee0b54 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -94,7 +94,3 @@ repos: args: - -w - -s - - repo: https://github.com/rhysd/actionlint - rev: v1.7.0 - hooks: - - id: actionlint diff --git a/.tool-versions b/.tool-versions index 9a5481e4..a86d47e3 100644 --- a/.tool-versions +++ b/.tool-versions @@ -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 diff --git a/Makefile b/Makefile index 978133bc..1dd28028 100644 --- a/Makefile +++ b/Makefile @@ -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)) @@ -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 @@ -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 & diff --git a/docker/README.md b/docker/README.md index 7b3f0dae..487976e0 100644 --- a/docker/README.md +++ b/docker/README.md @@ -10,7 +10,7 @@ -## 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 @@ -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://@pypi.fiftyone.ai fiftyone==0.17.0 + FIFTYONE_APP_INSTALL_FIFTYONE_OVERRIDE: pip install -U --index-url https://@pypi.fiftyone.ai fiftyone==0.17.1 ``` If you need your PyPI token, please contact your Customer Success representative @@ -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 @@ -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. @@ -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 @@ -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. @@ -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 @@ -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` @@ -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 @@ -760,4 +760,4 @@ for an example Nginx site configuration that forwards [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 diff --git a/docker/common-services.yaml b/docker/common-services.yaml index 5461c0af..325018fe 100644 --- a/docker/common-services.yaml +++ b/docker/common-services.yaml @@ -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} @@ -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} @@ -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 @@ -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} @@ -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} diff --git a/docs/custom-plugins.md b/docs/custom-plugins.md index ff006982..3e816671 100644 --- a/docs/custom-plugins.md +++ b/docs/custom-plugins.md @@ -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} . @@ -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 diff --git a/helm/fiftyone-teams-app/Chart.yaml b/helm/fiftyone-teams-app/Chart.yaml index 11f2b924..6efd5aa0 100644 --- a/helm/fiftyone-teams-app/Chart.yaml +++ b/helm/fiftyone-teams-app/Chart.yaml @@ -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 diff --git a/helm/fiftyone-teams-app/README.md b/helm/fiftyone-teams-app/README.md index 846b50c3..e0c30ca9 100644 --- a/helm/fiftyone-teams-app/README.md +++ b/helm/fiftyone-teams-app/README.md @@ -15,14 +15,14 @@ # fiftyone-teams-app -![Version: 1.7.0](https://img.shields.io/badge/Version-1.7.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.7.0](https://img.shields.io/badge/AppVersion-v1.7.0-informational?style=flat-square) +![Version: 1.7.1](https://img.shields.io/badge/Version-1.7.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.7.1](https://img.shields.io/badge/AppVersion-v1.7.1-informational?style=flat-square) FiftyOne Teams is the enterprise version of the open source [FiftyOne](https://github.com/voxel51/fiftyone) project. Please contact Voxel51 for more information regarding Fiftyone Teams. -## 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 @@ -47,7 +47,7 @@ something like the following to your `values.yaml`: ```yaml teamsAppSettings: env: - FIFTYONE_APP_INSTALL_FIFTYONE_OVERRIDE: pip install -U --index-url https://@pypi.fiftyone.ai fiftyone==0.17.0 + FIFTYONE_APP_INSTALL_FIFTYONE_OVERRIDE: pip install -U --index-url https://@pypi.fiftyone.ai fiftyone==0.17.1 ``` If you need your PyPI token, please contact your Customer Success representative @@ -587,7 +587,7 @@ appSettings: | teamsAppSettings.dnsName | string | `""` | DNS Name for the teams-app service. Used in the chart managed ingress (`spec.tls.hosts` and `spec.rules[0].host`) and teams-app deployment environment variable `AUTH0_BASE_URL`. | | teamsAppSettings.env.APP_USE_HTTPS | bool | `true` | Controls the protocol of the teams-app. Configure your ingress to match. When `true`, uses the https protocol. When `false`, uses the http protocol. | | teamsAppSettings.env.FIFTYONE_APP_ALLOW_MEDIA_EXPORT | bool | `true` | When `false`, disables media export options | -| teamsAppSettings.env.FIFTYONE_APP_TEAMS_SDK_RECOMMENDED_VERSION | string | `"0.17.0"` | The recommended fiftyone SDK version that will be displayed in the install modal (i.e. `pip install ... fiftyone==0.11.0`). | +| teamsAppSettings.env.FIFTYONE_APP_TEAMS_SDK_RECOMMENDED_VERSION | string | `"0.17.1"` | The recommended fiftyone SDK version that will be displayed in the install modal (i.e. `pip install ... fiftyone==0.11.0`). | | teamsAppSettings.env.FIFTYONE_APP_THEME | string | `"dark"` | The default theme configuration. `dark`: Theme will be dark when user visits for the first time. `light`: Theme will be light theme when user visits for the first time. `always-dark`: Sets dark theme on each refresh (overrides user theme changes in the app). `always-light`: Sets light theme on each refresh (overrides user theme changes in the app). | | teamsAppSettings.env.RECOIL_DUPLICATE_ATOM_KEY_CHECKING_ENABLED | bool | `false` | Disable duplicate atom/selector key checking that generated false-positive errors. [Reference][recoil-env]. | | teamsAppSettings.fiftyoneApiOverride | string | `""` | Overrides the `FIFTYONE_API_URI` environment variable. When set `FIFTYONE_API_URI` controls the value shown in the API Key Modal providing guidance for connecting to the FiftyOne Teams API. `FIFTYONE_API_URI` uses the value from apiSettings.dnsName if it is set, or uses the teamsAppSettings.dnsName | @@ -648,7 +648,7 @@ or 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. @@ -674,10 +674,10 @@ or modify your existing configuration to migrate to a new Auth0 Tenant. servicePort: 80 ``` -1. [Upgrade to FiftyOne Teams v1.7.0](#deploying-fiftyone-teams) +1. [Upgrade to FiftyOne Teams v1.7.1](#deploying-fiftyone-teams) > **NOTE**: At this step, FiftyOne SDK users will lose access to the - > FiftyOne Teams Database until they upgrade to `fiftyone==0.17.0` -1. Upgrade your FiftyOne SDKs to version 0.17.0 + > FiftyOne Teams Database until they upgrade to `fiftyone==0.17.1` +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 `Account > Install FiftyOne` @@ -695,7 +695,7 @@ or modify your existing configuration to migrate to a new Auth0 Tenant. ### From FiftyOne Teams Versions After 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 @@ -733,8 +733,8 @@ or modify your existing configuration to migrate to a new Auth0 Tenant. 1. `secret.fiftyone.fiftyoneAuthSecret` (or your deployment's equivalent) 1. This sets the `FIFTYONE_AUTH_SECRET` environment variable in the appropriate service pods -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` @@ -744,9 +744,9 @@ or 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 + > **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. 1. Validate that all datasets are now at version 0.24.0 @@ -770,15 +770,15 @@ or 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 @@ -836,7 +836,7 @@ A minimal example `values.yaml` may be found [ingress]: https://kubernetes.io/docs/concepts/services-networking/ingress/ [internal-auth-mode]: https://docs.voxel51.com/teams/pluggable_auth.html#internal-mode [labels-and-selectors]: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ -[legacy-auth-mode]: topher/document-install-modal-override +[legacy-auth-mode]: https://docs.voxel51.com/teams/pluggable_auth.html#legacy-mode [node-selector]: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector [ports]: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports [probes]: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ diff --git a/helm/fiftyone-teams-app/README.md.gotmpl b/helm/fiftyone-teams-app/README.md.gotmpl index 903ade87..a5cb8537 100644 --- a/helm/fiftyone-teams-app/README.md.gotmpl +++ b/helm/fiftyone-teams-app/README.md.gotmpl @@ -24,7 +24,7 @@ Please contact Voxel51 for more information regarding Fiftyone Teams. -## 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 @@ -49,7 +49,7 @@ something like the following to your `values.yaml`: ```yaml teamsAppSettings: env: - FIFTYONE_APP_INSTALL_FIFTYONE_OVERRIDE: pip install -U --index-url https://@pypi.fiftyone.ai fiftyone==0.17.0 + FIFTYONE_APP_INSTALL_FIFTYONE_OVERRIDE: pip install -U --index-url https://@pypi.fiftyone.ai fiftyone==0.17.1 ``` If you need your PyPI token, please contact your Customer Success representative @@ -472,7 +472,7 @@ or 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. @@ -498,10 +498,10 @@ or modify your existing configuration to migrate to a new Auth0 Tenant. servicePort: 80 ``` -1. [Upgrade to FiftyOne Teams v1.7.0](#deploying-fiftyone-teams) +1. [Upgrade to FiftyOne Teams v1.7.1](#deploying-fiftyone-teams) > **NOTE**: At this step, FiftyOne SDK users will lose access to the - > FiftyOne Teams Database until they upgrade to `fiftyone==0.17.0` -1. Upgrade your FiftyOne SDKs to version 0.17.0 + > FiftyOne Teams Database until they upgrade to `fiftyone==0.17.1` +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 `Account > Install FiftyOne` @@ -519,7 +519,7 @@ or modify your existing configuration to migrate to a new Auth0 Tenant. ### From FiftyOne Teams Versions After 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 @@ -557,8 +557,8 @@ or modify your existing configuration to migrate to a new Auth0 Tenant. 1. `secret.fiftyone.fiftyoneAuthSecret` (or your deployment's equivalent) 1. This sets the `FIFTYONE_AUTH_SECRET` environment variable in the appropriate service pods -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` @@ -568,9 +568,9 @@ or 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 + > **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. 1. Validate that all datasets are now at version 0.24.0 @@ -594,15 +594,15 @@ or 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 @@ -660,7 +660,7 @@ A minimal example `values.yaml` may be found [ingress]: https://kubernetes.io/docs/concepts/services-networking/ingress/ [internal-auth-mode]: https://docs.voxel51.com/teams/pluggable_auth.html#internal-mode [labels-and-selectors]: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ -[legacy-auth-mode]: topher/document-install-modal-override +[legacy-auth-mode]: https://docs.voxel51.com/teams/pluggable_auth.html#legacy-mode [node-selector]: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector [ports]: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports [probes]: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/ diff --git a/helm/fiftyone-teams-app/values.yaml b/helm/fiftyone-teams-app/values.yaml index c37ab819..05c2d8b4 100644 --- a/helm/fiftyone-teams-app/values.yaml +++ b/helm/fiftyone-teams-app/values.yaml @@ -503,7 +503,7 @@ teamsAppSettings: FIFTYONE_APP_ALLOW_MEDIA_EXPORT: true # -- The recommended fiftyone SDK version that will be displayed in the # install modal (i.e. `pip install ... fiftyone==0.11.0`). - FIFTYONE_APP_TEAMS_SDK_RECOMMENDED_VERSION: 0.17.0 + FIFTYONE_APP_TEAMS_SDK_RECOMMENDED_VERSION: 0.17.1 # -- The default theme configuration. # `dark`: Theme will be dark when user visits for the first time. # `light`: Theme will be light theme when user visits for the first time. diff --git a/helm/gke-example/values.yaml b/helm/gke-example/values.yaml index fcfa2778..dcdfdf37 100644 --- a/helm/gke-example/values.yaml +++ b/helm/gke-example/values.yaml @@ -59,7 +59,7 @@ secret: # appSettings: # env: -# # FIFTYONE_DATABASE_ADMIN is set to `false` by default for v1.7.0 installs +# # FIFTYONE_DATABASE_ADMIN is set to `false` by default for v1.7.1 installs # # If you are performing a new install or an upgrade from v1.0 or earlier # # you may want to set this value to `true`. # # Please see https://helm.fiftyone.ai/#initial-installation-vs-upgrades for details diff --git a/helm/values.yaml b/helm/values.yaml index aec9b960..c79338e5 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -66,12 +66,12 @@ secret: # FIFTYONE_PLUGINS_DIR: /opt/plugins # # Set FIFTYONE_TEAMS_VERSION_OVERRIDE to override the `Install FiftyOne` # # bash command in the `Settings > Install FiftyOne` modal -# FIFTYONE_TEAMS_VERSION_OVERRIDE: pip install --index-url https://privatepypi.internal.org fiftyone==0.17.0 +# FIFTYONE_TEAMS_VERSION_OVERRIDE: pip install --index-url https://privatepypi.internal.org fiftyone==0.17.1 appSettings: env: - # FIFTYONE_DATABASE_ADMIN is set to `false` by default for v1.7.0 + # FIFTYONE_DATABASE_ADMIN is set to `false` by default for v1.7.1 # If you are performing a new install or an upgrade from v1.0 or earlier you may want to set # this value to `true`. # Please see https://helm.fiftyone.ai/#initial-installation-vs-upgrades for details diff --git a/skaffold.yaml b/skaffold.yaml index 2497ef50..ed847350 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -36,7 +36,7 @@ deploy: releases: - name: fiftyone-teams chartPath: helm/fiftyone-teams-app - version: 1.7.0 + version: 1.7.1 createNamespace: true namespace: fiftyone-teams overrides: @@ -48,12 +48,8 @@ deploy: # See https://console.cloud.google.com/artifacts/docker/computer-vision-team/us-central1/dev-docker?project=computer-vision-team repository: us-central1-docker.pkg.dev/computer-vision-team/dev-docker/fiftyone-teams-api pullPolicy: IfNotPresent - tag: v1.7.0rc9 - service: - liveness: - initialDelaySeconds: 15 - readiness: - initialDelaySeconds: 15 + tag: v1.7.1rc5 + appSettings: env: # Only set to true during the initial installation or during a database upgrade @@ -68,12 +64,8 @@ deploy: # See https://console.cloud.google.com/artifacts/docker/computer-vision-team/us-central1/dev-docker?project=computer-vision-team repository: us-central1-docker.pkg.dev/computer-vision-team/dev-docker/fiftyone-app pullPolicy: IfNotPresent - tag: v1.7.0rc9 - service: - liveness: - initialDelaySeconds: 15 - readiness: - initialDelaySeconds: 15 + tag: v1.7.1rc5 + # TODO: Test `minikube addons configure registry-creds` or # When using minikube's addon registry-creds, we may also need to create the k8s secret `regcred` # See https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ @@ -152,12 +144,8 @@ deploy: # See https://console.cloud.google.com/artifacts/docker/computer-vision-team/us-central1/dev-docker?project=computer-vision-team repository: us-central1-docker.pkg.dev/computer-vision-team/dev-docker/fiftyone-app pullPolicy: IfNotPresent - tag: v1.7.0rc9 - service: - liveness: - initialDelaySeconds: 15 - readiness: - initialDelaySeconds: 15 + tag: v1.7.1rc5 + teamsAppSettings: dnsName: local.fiftyone.ai # env: @@ -174,12 +162,8 @@ deploy: # The others are `vW.X.Y.devZ` (note `.devZ` vs `-dev.Z`). # This is a byproduct of `npm` versioning versus Python PEP 440. pullPolicy: IfNotPresent - tag: v1.7.0-rc.8 - service: - liveness: - initialDelaySeconds: 15 - readiness: - initialDelaySeconds: 15 + tag: v1.7.1-rc.4 + casSettings: env: DEBUG: cas:* @@ -187,10 +171,6 @@ deploy: # See https://console.cloud.google.com/artifacts/docker/computer-vision-team/us-central1/dev-docker?project=computer-vision-team repository: us-central1-docker.pkg.dev/computer-vision-team/dev-docker/fiftyone-teams-cas pullPolicy: IfNotPresent - tag: v1.7.0-rc.8 - service: - liveness: - initialDelaySeconds: 15 - readiness: - initialDelaySeconds: 15 + tag: v1.7.1-rc.4 + kubeContext: minikube diff --git a/tests/fixtures/docker/integration_internal_auth.env b/tests/fixtures/docker/integration_internal_auth.env index 5b65f1fd..6fb029ff 100644 --- a/tests/fixtures/docker/integration_internal_auth.env +++ b/tests/fixtures/docker/integration_internal_auth.env @@ -23,8 +23,8 @@ FIFTYONE_ENV=development CAS_DEBUG="cas:*" # Image tags for existing artifacts -VERSION=v1.7.0 -FIFTYONE_APP_VERSION="${VERSION}rc7" -FIFTYONE_TEAMS_API_VERSION="${VERSION}rc7" -FIFTYONE_TEAMS_APP_VERSION="${VERSION}-rc.6" -FIFTYONE_TEAMS_CAS_VERSION="${VERSION}-rc.6" +VERSION=v1.7.1 +FIFTYONE_APP_VERSION="${VERSION}rc0" +FIFTYONE_TEAMS_API_VERSION="${VERSION}rc0" +FIFTYONE_TEAMS_APP_VERSION="${VERSION}-rc.0" +FIFTYONE_TEAMS_CAS_VERSION="${VERSION}-rc.0" diff --git a/tests/fixtures/docker/integration_legacy_auth.env b/tests/fixtures/docker/integration_legacy_auth.env index 789dfb63..78c7f6c3 100644 --- a/tests/fixtures/docker/integration_legacy_auth.env +++ b/tests/fixtures/docker/integration_legacy_auth.env @@ -41,8 +41,8 @@ FIFTYONE_ENV=development CAS_DEBUG="cas:*" # Image tags for existing artifacts -VERSION=v1.7.0 -FIFTYONE_APP_VERSION="${VERSION}rc7" -FIFTYONE_TEAMS_API_VERSION="${VERSION}rc7" -FIFTYONE_TEAMS_APP_VERSION="${VERSION}-rc.6" -FIFTYONE_TEAMS_CAS_VERSION="${VERSION}-rc.6" +VERSION=v1.7.1 +FIFTYONE_APP_VERSION="${VERSION}rc0" +FIFTYONE_TEAMS_API_VERSION="${VERSION}rc0" +FIFTYONE_TEAMS_APP_VERSION="${VERSION}-rc.0" +FIFTYONE_TEAMS_CAS_VERSION="${VERSION}-rc.0" diff --git a/tests/fixtures/helm/integration_values.yaml b/tests/fixtures/helm/integration_values.yaml index 3fb0ea83..e704413d 100644 --- a/tests/fixtures/helm/integration_values.yaml +++ b/tests/fixtures/helm/integration_values.yaml @@ -9,7 +9,7 @@ apiSettings: # See https://console.cloud.google.com/artifacts/docker/computer-vision-team/us-central1/dev-docker?project=computer-vision-team repository: us-central1-docker.pkg.dev/computer-vision-team/dev-docker/fiftyone-teams-api pullPolicy: IfNotPresent - tag: v1.7.0.dev20 + tag: v1.7.1rc0 service: liveness: initialDelaySeconds: 15 @@ -29,12 +29,7 @@ appSettings: # See https://console.cloud.google.com/artifacts/docker/computer-vision-team/us-central1/dev-docker?project=computer-vision-team repository: us-central1-docker.pkg.dev/computer-vision-team/dev-docker/fiftyone-app pullPolicy: IfNotPresent - tag: v1.7.0.dev20 - service: - liveness: - initialDelaySeconds: 15 - readiness: - initialDelaySeconds: 15 + tag: v1.7.1rc0 # TODO: Test `minikube addons configure registry-creds` or # When using minikube's addon registry-creds, we may also need to create the k8s secret `regcred` # See https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ @@ -113,12 +108,7 @@ pluginsSettings: # See https://console.cloud.google.com/artifacts/docker/computer-vision-team/us-central1/dev-docker?project=computer-vision-team repository: us-central1-docker.pkg.dev/computer-vision-team/dev-docker/fiftyone-app pullPolicy: IfNotPresent - tag: v1.7.0.dev20 - service: - liveness: - initialDelaySeconds: 15 - readiness: - initialDelaySeconds: 15 + tag: v1.7.1rc0 teamsAppSettings: dnsName: local.fiftyone.ai # env: @@ -135,12 +125,7 @@ teamsAppSettings: # The others are `vW.X.Y.devZ` (note `.devZ` vs `-dev.Z`). # This is a byproduct of `npm` versioning versus Python PEP 440. pullPolicy: IfNotPresent - tag: v1.7.0-dev.16 - service: - liveness: - initialDelaySeconds: 15 - readiness: - initialDelaySeconds: 15 + tag: v1.7.1-rc.0 casSettings: env: DEBUG: cas:* @@ -149,9 +134,4 @@ casSettings: # See https://console.cloud.google.com/artifacts/docker/computer-vision-team/us-central1/dev-docker?project=computer-vision-team repository: us-central1-docker.pkg.dev/computer-vision-team/dev-docker/fiftyone-teams-cas pullPolicy: IfNotPresent - tag: v1.7.0-dev.1 - service: - liveness: - initialDelaySeconds: 15 - readiness: - initialDelaySeconds: 15 + tag: v1.7.1-rc.0 diff --git a/tests/unit/compose/docker-compose-internal-auth_test.go b/tests/unit/compose/docker-compose-internal-auth_test.go index a819b09c..e74f5db0 100644 --- a/tests/unit/compose/docker-compose-internal-auth_test.go +++ b/tests/unit/compose/docker-compose-internal-auth_test.go @@ -141,35 +141,35 @@ func (s *commonServicesInternalAuthDockerComposeTest) TestServiceImage() { "fiftyone-app", []string{internalAuthComposeFile}, s.dotEnvFiles, - "voxel51/fiftyone-app:v1.7.0", + "voxel51/fiftyone-app:v1.7.1", }, { "defaultTeamsApi", "teams-api", []string{internalAuthComposeFile}, s.dotEnvFiles, - "voxel51/fiftyone-teams-api:v1.7.0", + "voxel51/fiftyone-teams-api:v1.7.1", }, { "defaultTeamsApp", "teams-app", []string{internalAuthComposeFile}, s.dotEnvFiles, - "voxel51/fiftyone-teams-app:v1.7.0", + "voxel51/fiftyone-teams-app:v1.7.1", }, { "defaultTeamsCas", "teams-cas", []string{internalAuthComposeFile}, s.dotEnvFiles, - "voxel51/fiftyone-teams-cas:v1.7.0", + "voxel51/fiftyone-teams-cas:v1.7.1", }, { "dedicatedPluginsTeamsPlugins", "teams-plugins", []string{internalAuthComposeDedicatedPluginsFile}, s.dotEnvFiles, - "voxel51/fiftyone-app:v1.7.0", + "voxel51/fiftyone-app:v1.7.1", }, } @@ -264,7 +264,7 @@ func (s *commonServicesInternalAuthDockerComposeTest) TestServiceEnvironment() { "FEATURE_FLAG_ENABLE_INVITATIONS=false", "FIFTYONE_API_URI=https://example-api.fiftyone.ai", "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=test-fiftyone-auth-secret", "FIFTYONE_SERVER_ADDRESS=", "FIFTYONE_SERVER_PATH_PREFIX=/api/proxy/fiftyone-teams", @@ -343,7 +343,7 @@ func (s *commonServicesInternalAuthDockerComposeTest) TestServiceEnvironment() { "FEATURE_FLAG_ENABLE_INVITATIONS=false", "FIFTYONE_API_URI=https://example-api.fiftyone.ai", "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=test-fiftyone-auth-secret", "FIFTYONE_SERVER_ADDRESS=", "FIFTYONE_SERVER_PATH_PREFIX=/api/proxy/fiftyone-teams", @@ -420,7 +420,7 @@ func (s *commonServicesInternalAuthDockerComposeTest) TestServiceEnvironment() { "FEATURE_FLAG_ENABLE_INVITATIONS=false", "FIFTYONE_API_URI=https://example-api.fiftyone.ai", "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=test-fiftyone-auth-secret", "FIFTYONE_SERVER_ADDRESS=", "FIFTYONE_SERVER_PATH_PREFIX=/api/proxy/fiftyone-teams", diff --git a/tests/unit/compose/docker-compose-legacy-auth_test.go b/tests/unit/compose/docker-compose-legacy-auth_test.go index 59a4f85b..990038be 100644 --- a/tests/unit/compose/docker-compose-legacy-auth_test.go +++ b/tests/unit/compose/docker-compose-legacy-auth_test.go @@ -141,35 +141,35 @@ func (s *commonServicesLegacyAuthDockerComposeTest) TestServiceImage() { "fiftyone-app", []string{legacyAuthComposeFile}, s.dotEnvFiles, - "voxel51/fiftyone-app:v1.7.0", + "voxel51/fiftyone-app:v1.7.1", }, { "defaultTeamsApi", "teams-api", []string{legacyAuthComposeFile}, s.dotEnvFiles, - "voxel51/fiftyone-teams-api:v1.7.0", + "voxel51/fiftyone-teams-api:v1.7.1", }, { "defaultTeamsApp", "teams-app", []string{legacyAuthComposeFile}, s.dotEnvFiles, - "voxel51/fiftyone-teams-app:v1.7.0", + "voxel51/fiftyone-teams-app:v1.7.1", }, { "defaultTeamsCas", "teams-cas", []string{legacyAuthComposeFile}, s.dotEnvFiles, - "voxel51/fiftyone-teams-cas:v1.7.0", + "voxel51/fiftyone-teams-cas:v1.7.1", }, { "dedicatedPluginsTeamsPlugins", "teams-plugins", []string{legacyAuthComposeDedicatedPluginsFile}, s.dotEnvFiles, - "voxel51/fiftyone-app:v1.7.0", + "voxel51/fiftyone-app:v1.7.1", }, } @@ -263,7 +263,7 @@ func (s *commonServicesLegacyAuthDockerComposeTest) TestServiceEnvironment() { "FEATURE_FLAG_ENABLE_INVITATIONS=false", "FIFTYONE_API_URI=https://example-api.fiftyone.ai", "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=test-fiftyone-auth-secret", "FIFTYONE_SERVER_ADDRESS=", "FIFTYONE_SERVER_PATH_PREFIX=/api/proxy/fiftyone-teams", @@ -348,7 +348,7 @@ func (s *commonServicesLegacyAuthDockerComposeTest) TestServiceEnvironment() { "FEATURE_FLAG_ENABLE_INVITATIONS=false", "FIFTYONE_API_URI=https://example-api.fiftyone.ai", "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=test-fiftyone-auth-secret", "FIFTYONE_SERVER_ADDRESS=", "FIFTYONE_SERVER_PATH_PREFIX=/api/proxy/fiftyone-teams", @@ -431,7 +431,7 @@ func (s *commonServicesLegacyAuthDockerComposeTest) TestServiceEnvironment() { "FEATURE_FLAG_ENABLE_INVITATIONS=false", "FIFTYONE_API_URI=https://example-api.fiftyone.ai", "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=test-fiftyone-auth-secret", "FIFTYONE_SERVER_ADDRESS=", "FIFTYONE_SERVER_PATH_PREFIX=/api/proxy/fiftyone-teams", diff --git a/tests/unit/helm/teams-app-deployment_test.go b/tests/unit/helm/teams-app-deployment_test.go index 066e143e..60fb3b37 100644 --- a/tests/unit/helm/teams-app-deployment_test.go +++ b/tests/unit/helm/teams-app-deployment_test.go @@ -313,7 +313,7 @@ func (s *deploymentTeamsAppTemplateTest) TestContainerEnv() { }, { "name": "FIFTYONE_APP_TEAMS_SDK_RECOMMENDED_VERSION", - "value": "0.17.0" + "value": "0.17.1" }, { "name": "FIFTYONE_APP_THEME", @@ -384,7 +384,7 @@ func (s *deploymentTeamsAppTemplateTest) TestContainerEnv() { }, { "name": "FIFTYONE_APP_TEAMS_SDK_RECOMMENDED_VERSION", - "value": "0.17.0" + "value": "0.17.1" }, { "name": "FIFTYONE_APP_THEME",