Add monitor flag to common DO service deployment

docker/README.md

@@ -658,6 +658,8 @@ services:
 | `FIFTYONE_DELEGATED_OPERATION_RUN_LINK_PATH` | Full path to a network-mounted file system or a cloud storage path to use for storing logs generated by delegated operation runs, one file per job. The default `null` means log upload is disabled.                                                                           | No                        |
 | `FIFTYONE_DEFAULT_APP_ADDRESS`               | The host address that `fiftyone-app` should bind to; `127.0.0.1` is appropriate in most cases                                                                                                                                                                                  | Yes                       |
 | `FIFTYONE_DEFAULT_APP_PORT`                  | The host port that `fiftyone-app` should bind to; the default is `5151`                                                                                                                                                                                                        | Yes                       |
+| `FIFTYONE_DO_EXPIRATION_DAYS`                | The amount of time in days that a delegated operation can run before being automatically terminated. Default is 1 day.                                                                                                                                                         | No                        |
+| `FIFTYONE_DO_EXPIRATION_MINUTES`             | The amount of time in minutes that a delegated operation can run before being automatically terminated. Default is `FIFTYONE_DO_EXPIRATION_DAYS` converted to minutes. If this field is provided it will override `FIFTYONE_DO_EXPIRATION_DAYS`.                               | No                        |
 | `FIFTYONE_ENCRYPTION_KEY`                    | Used to encrypt storage credentials in MongoDB                                                                                                                                                                                                                                 | Yes                       |
 | `FIFTYONE_ENV`                               | GraphQL verbosity for the `fiftyone-teams-api` service; `production` will not log every GraphQL query, any other value will                                                                                                                                                    | No                        |
 | `FIFTYONE_LOGGING_FORMAT`                    | The format to use for log messages; `json` or `text`. The default is `text`.                                                                                                                                                                                                   | No                        |

docker/common-services.yaml

@@ -160,7 +160,7 @@ services:
     deploy:
       replicas: ${FIFTYONE_DELEGATED_OPERATOR_WORKER_REPLICAS:-3}
     command: >
-      /bin/sh -c "fiftyone delegated launch -t remote"
+      /bin/sh -c "fiftyone delegated launch -t remote -m"
     environment:
       API_URL: ${API_URL}
       FIFTYONE_DATABASE_ADMIN: false

docker/docs/configuring-gpu-workloads.md

@@ -67,7 +67,7 @@ services:
   teams-do-with-gpu:
     image: voxel51/fiftyone-teams-cv-full:v2.11.1
     command: >
-      /bin/sh -c "fiftyone delegated launch -t remote  -n 'teams-do-with-gpu'"
+      /bin/sh -c "fiftyone delegated launch -t remote  -n 'teams-do-with-gpu' -m"
     environment:
       API_URL: ${API_URL}
       FIFTYONE_DATABASE_ADMIN: false

helm/fiftyone-teams-app/README.md

@@ -482,6 +482,8 @@ follow
 | apiSettings.deploymentAnnotations | object | `{}` | Annotations for the `teams-api` deployment. [Reference][annotations]. |
 | apiSettings.dnsName | string | `""` | Controls whether `teams-api` is added to the chart's ingress. When an empty string, a rule for `teams-api` is not added to the chart managed ingress. When not an empty string, becomes the value to the `host` in the ingress' rule and set `ingress.api` too. Additionally, the `apiSettings.dnsName` is used by `teams-api` to generate the `API_EXTERNAL_URL` environment variable for configuring external orchestrators. |
 | apiSettings.env.FIFTYONE_ENV | string | `"production"` | Controls FiftyOne GraphQL verbosity. When "production", debug mode is disabled and the default logging level is "INFO". When "development", debug mode is enabled and the default logging level is "DEBUG". Can be overridden by setting `apiSettings.env.LOGGING_LEVEL`. |
+| apiSettings.env.FIFTYONE_DO_EXPIRATION_DAYS | int | `1` | The amount of time in days that a delegated operation can run before being automatically terminated. |
+| apiSettings.env.FIFTYONE_DO_EXPIRATION_MINUTES | int | `FIFTYONE_DO_EXPIRATION_DAYS * 24 * 60` | The amount of time in minutes that a delegated operation can run before being automatically terminated. If this field is provided it will override `FIFTYONE_DO_EXPIRATION_DAYS`. |
 | apiSettings.env.FIFTYONE_INTERNAL_SERVICE | bool | `true` | Whether the SDK is running in an internal service context. When running in FiftyOne Enterprise, set to `true`. |
 | apiSettings.env.FIFTYONE_LOGGING_FORMAT | string | `"text"` | The format to use for log messages. Can be one of `json` or `text`. |
 | apiSettings.env.GRAPHQL_DEFAULT_LIMIT | int | `10` | Default number of returned items when listing in GraphQL queries. Can be overridden in the request. |

helm/fiftyone-teams-app/templates/delegated-operator-instance-deployment.yaml

@@ -63,6 +63,7 @@ spec:
             {{- if ($v.description | default $defaultDescription) }}
             - -d
             - {{ ($v.description | default $defaultDescription) | quote }}
+            - -m
             {{- end }}
           securityContext:
             {{- toYaml (merge (dict) ($v.securityContext | default dict) ($baseTpl.securityContext)) | nindent 12 }}

tests/fixtures/docker/integration_internal_auth.env

@@ -31,10 +31,10 @@ FIFTYONE_ENV=development
 CAS_DEBUG="cas:*"
 
 # Image tags for existing artifacts
-VERSION=v2.11.1
-FIFTYONE_APP_VERSION=v2.11.1
-FIFTYONE_TEAMS_API_VERSION=v2.11.1
-FIFTYONE_TEAMS_APP_VERSION=v2.11.1
-FIFTYONE_TEAMS_CAS_VERSION=v2.11.1
+VERSION=v2.12.0.dev45
+FIFTYONE_APP_VERSION=v2.12.0.dev45
+FIFTYONE_TEAMS_API_VERSION=v2.12.0.dev45
+FIFTYONE_TEAMS_APP_VERSION=v2.12.0-dev.45
+FIFTYONE_TEAMS_CAS_VERSION=v2.12.0-dev.45
 
 FIFTYONE_DELEGATED_OPERATOR_WORKER_REPLICAS=1

tests/fixtures/docker/integration_legacy_auth.env

@@ -39,10 +39,10 @@ FIFTYONE_ENV=development
 CAS_DEBUG="cas:*"
 
 # Image tags for existing artifacts
-VERSION=v2.11.1
-FIFTYONE_APP_VERSION=v2.11.1
-FIFTYONE_TEAMS_API_VERSION=v2.11.1
-FIFTYONE_TEAMS_APP_VERSION=v2.11.1
-FIFTYONE_TEAMS_CAS_VERSION=v2.11.1
+VERSION=v2.12.0.dev45
+FIFTYONE_APP_VERSION=v2.12.0.dev45
+FIFTYONE_TEAMS_API_VERSION=v2.12.0.dev45
+FIFTYONE_TEAMS_APP_VERSION=v2.12.0-dev.45
+FIFTYONE_TEAMS_CAS_VERSION=v2.12.0-dev.45
 
 FIFTYONE_DELEGATED_OPERATOR_WORKER_REPLICAS=1

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: v2.11.1
+    tag: v2.12.0.dev45
   service:
     liveness:
       initialDelaySeconds: 15
@@ -27,7 +27,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: v2.11.1
+    tag: v2.12.0.dev45
 # 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/
@@ -42,14 +42,14 @@ 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: v2.11.1
+    tag: v2.12.0-dev.45
 delegatedOperatorDeployments:
   deployments:
     teamsDo:
       image:
         repository: us-central1-docker.pkg.dev/computer-vision-team/dev-docker/fiftyone-app
         pullPolicy: IfNotPresent
-        tag: v2.11.1
+        tag: v2.12.0.dev45
 ingress:
   annotations:
     # For using the nginx-ingress controller with cert-manager self signed certificates
@@ -104,7 +104,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: v2.11.1
+    tag: v2.12.0.dev45
 teamsAppSettings:
   dnsName: local.fiftyone.ai
   # env:
@@ -121,4 +121,4 @@ 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: v2.11.1
+    tag: v2.12.0-dev.45

tests/unit/helm/delegated-operator-instance-deployment_test.go

@@ -4937,6 +4937,7 @@ func (s *deploymentDelegatedOperatorInstanceTemplateTest) TestContainerCmdArgs()
 						"teams-do",
 						"-d",
 						"Long running operations delegated to teams-do",
+						"-m",
 					}
 					s.Equal(expectedArgs, args, "Args should be equal")
 				},
@@ -4959,6 +4960,7 @@ func (s *deploymentDelegatedOperatorInstanceTemplateTest) TestContainerCmdArgs()
 						"teams-do",
 						"-d",
 						"Long running operations delegated to teams-do",
+						"-m",
 					}
 					s.Equal(expectedArgs, args, "Args should be equal")
 				},
@@ -4972,6 +4974,7 @@ func (s *deploymentDelegatedOperatorInstanceTemplateTest) TestContainerCmdArgs()
 						"teams-do-two",
 						"-d",
 						"Long running operations delegated to teams-do-two",
+						"-m",
 					}
 					s.Equal(expectedArgs, args, "Args should be equal")
 				},
@@ -4995,6 +4998,7 @@ func (s *deploymentDelegatedOperatorInstanceTemplateTest) TestContainerCmdArgs()
 						"teams-do",
 						"-d",
 						"Long running operations delegated to teams-do",
+						"-m",
 					}
 					s.Equal(expectedArgs, args, "Args should be equal")
 				},
@@ -5008,6 +5012,7 @@ func (s *deploymentDelegatedOperatorInstanceTemplateTest) TestContainerCmdArgs()
 						"teams-do-two",
 						"-d",
 						"Long running operations delegated to teams-do-two",
+						"-m",
 					}
 					s.Equal(expectedArgs, args, "Args should be equal")
 				},
@@ -5030,6 +5035,7 @@ func (s *deploymentDelegatedOperatorInstanceTemplateTest) TestContainerCmdArgs()
 						"teams-do",
 						"-d",
 						"Used for non-gpu workloads",
+						"-m",
 					}
 					s.Equal(expectedArgs, args, "Args should be equal")
 				},
@@ -5043,6 +5049,7 @@ func (s *deploymentDelegatedOperatorInstanceTemplateTest) TestContainerCmdArgs()
 						"teams-do-two",
 						"-d",
 						"Long running operations delegated to teams-do-two",
+						"-m",
 					}
 					s.Equal(expectedArgs, args, "Args should be equal")
 				},
@@ -5066,6 +5073,7 @@ func (s *deploymentDelegatedOperatorInstanceTemplateTest) TestContainerCmdArgs()
 						"teams-do",
 						"-d",
 						"Used for non-gpu workloads",
+						"-m",
 					}
 					s.Equal(expectedArgs, args, "Args should be equal")
 				},
@@ -5079,6 +5087,7 @@ func (s *deploymentDelegatedOperatorInstanceTemplateTest) TestContainerCmdArgs()
 						"teams-do-two",
 						"-d",
 						"Long running operations delegated to teams-do-two",
+						"-m",
 					}
 					s.Equal(expectedArgs, args, "Args should be equal")
 				},