From bf6d6df8f1fe257f8ac2a6f267dc5211b8e73bc0 Mon Sep 17 00:00:00 2001 From: Jeev B Date: Fri, 15 Sep 2023 12:31:47 -0700 Subject: [PATCH] Set reasonable defaults and unconstrained limits for flyte-sandbox Signed-off-by: Jeev B --- charts/flyte-binary/README.md | 1 + charts/flyte-core/README.md | 2 +- charts/flyte-deps/README.md | 2 +- charts/flyte-sandbox/README.md | 9 +++++++++ charts/flyte-sandbox/values.yaml | 11 +++++++++++ charts/flyte/README.md | 2 +- charts/flyteagent/README.md | 1 + docker/sandbox-bundled/manifests/complete.yaml | 17 ++++++++++++++--- docker/sandbox-bundled/manifests/dev.yaml | 4 ++-- 9 files changed, 41 insertions(+), 8 deletions(-) diff --git a/charts/flyte-binary/README.md b/charts/flyte-binary/README.md index c81a0f9e72..46b62377a9 100644 --- a/charts/flyte-binary/README.md +++ b/charts/flyte-binary/README.md @@ -155,3 +155,4 @@ Chart for basic single Flyte executable deployment | serviceAccount.imagePullSecrets | list | `[]` | | | serviceAccount.labels | object | `{}` | | | serviceAccount.name | string | `""` | | + diff --git a/charts/flyte-core/README.md b/charts/flyte-core/README.md index 0be1360f43..7150f049ce 100644 --- a/charts/flyte-core/README.md +++ b/charts/flyte-core/README.md @@ -261,4 +261,4 @@ helm install gateway bitnami/contour -n flyte | webhook.serviceAccount.create | bool | `true` | Should a service account be created for the webhook | | webhook.serviceAccount.imagePullSecrets | list | `[]` | ImagePullSecrets to automatically assign to the service account | | workflow_notifications | object | `{"config":{},"enabled":false}` | **Optional Component** Workflow notifications module is an optional dependency. Flyte uses cloud native pub-sub systems to notify users of various events in their workflows | -| workflow_scheduler | object | `{"config":{},"enabled":false,"type":""}` | **Optional Component** Flyte uses a cloud hosted Cron scheduler to run workflows on a schedule. The following module is optional. Without, this module, you will not have scheduled launchplans / workflows. Docs: https://docs.flyte.org/en/latest/howto/enable_and_use_schedules.html#setting-up-scheduled-workflows | \ No newline at end of file +| workflow_scheduler | object | `{"config":{},"enabled":false,"type":""}` | **Optional Component** Flyte uses a cloud hosted Cron scheduler to run workflows on a schedule. The following module is optional. Without, this module, you will not have scheduled launchplans / workflows. Docs: https://docs.flyte.org/en/latest/howto/enable_and_use_schedules.html#setting-up-scheduled-workflows | diff --git a/charts/flyte-deps/README.md b/charts/flyte-deps/README.md index 4d21e6e18e..0cbf338fed 100644 --- a/charts/flyte-deps/README.md +++ b/charts/flyte-deps/README.md @@ -119,4 +119,4 @@ helm upgrade -f values.yaml flyte . | sparkoperator | object | `{"enabled":false}` | Optional: Spark Plugin using the Spark Operator | | sparkoperator.enabled | bool | `false` | - enable or disable Sparkoperator deployment installation | | webhook.enabled | bool | `true` | | -| webhook.service | object | `{"annotations":{"projectcontour.io/upstream-protocol.h2c":"grpc"},"type":"ClusterIP"}` | Service settings for the webhook | \ No newline at end of file +| webhook.service | object | `{"annotations":{"projectcontour.io/upstream-protocol.h2c":"grpc"},"type":"ClusterIP"}` | Service settings for the webhook | diff --git a/charts/flyte-sandbox/README.md b/charts/flyte-sandbox/README.md index 47821a9eac..6e584f51c2 100644 --- a/charts/flyte-sandbox/README.md +++ b/charts/flyte-sandbox/README.md @@ -31,6 +31,14 @@ A Helm chart for the Flyte local sandbox | flyte-binary.configuration.inline.plugins.k8s.default-env-vars[1].FLYTE_AWS_ACCESS_KEY_ID | string | `"minio"` | | | flyte-binary.configuration.inline.plugins.k8s.default-env-vars[2].FLYTE_AWS_SECRET_ACCESS_KEY | string | `"miniostorage"` | | | flyte-binary.configuration.inline.storage.signedURL.stowConfigOverride.endpoint | string | `"http://localhost:30002"` | | +| flyte-binary.configuration.inline.task_resources.defaults.cpu | string | `"500m"` | | +| flyte-binary.configuration.inline.task_resources.defaults.ephemeralStorage | int | `0` | | +| flyte-binary.configuration.inline.task_resources.defaults.gpu | int | `0` | | +| flyte-binary.configuration.inline.task_resources.defaults.memory | string | `"1Gi"` | | +| flyte-binary.configuration.inline.task_resources.limits.cpu | int | `0` | | +| flyte-binary.configuration.inline.task_resources.limits.ephemeralStorage | int | `0` | | +| flyte-binary.configuration.inline.task_resources.limits.gpu | int | `0` | | +| flyte-binary.configuration.inline.task_resources.limits.memory | int | `0` | | | flyte-binary.configuration.inlineConfigMap | string | `"{{ include \"flyte-sandbox.configuration.inlineConfigMap\" . }}"` | | | flyte-binary.configuration.logging.level | int | `6` | | | flyte-binary.configuration.logging.plugins.kubernetes.enabled | bool | `true` | | @@ -101,3 +109,4 @@ A Helm chart for the Flyte local sandbox | sandbox.proxy.image.pullPolicy | string | `"Never"` | | | sandbox.proxy.image.repository | string | `"envoyproxy/envoy"` | | | sandbox.proxy.image.tag | string | `"sandbox"` | | + diff --git a/charts/flyte-sandbox/values.yaml b/charts/flyte-sandbox/values.yaml index 8d7b732c55..0848ed7097 100644 --- a/charts/flyte-sandbox/values.yaml +++ b/charts/flyte-sandbox/values.yaml @@ -36,6 +36,17 @@ flyte-binary: templateUri: |- http://localhost:30080/kubernetes-dashboard/#/log/{{.namespace }}/{{ .podName }}/pod?namespace={{ .namespace }} inline: + task_resources: + defaults: + cpu: 500m + ephemeralStorage: 0 + gpu: 0 + memory: 1Gi + limits: + cpu: 0 + ephemeralStorage: 0 + gpu: 0 + memory: 0 storage: signedURL: stowConfigOverride: diff --git a/charts/flyte/README.md b/charts/flyte/README.md index 922d184c0c..75f8912e0d 100644 --- a/charts/flyte/README.md +++ b/charts/flyte/README.md @@ -249,4 +249,4 @@ helm upgrade -f values-sandbox.yaml flyte . | redoc.service | object | `{"type":"ClusterIP"}` | Service settings for Minio | | redoc.tolerations | list | `[]` | tolerations for Minio deployment | | sparkoperator | object | `{"enabled":false}` | Optional: Spark Plugin using the Spark Operator | -| sparkoperator.enabled | bool | `false` | - enable or disable Sparkoperator deployment installation | \ No newline at end of file +| sparkoperator.enabled | bool | `false` | - enable or disable Sparkoperator deployment installation | diff --git a/charts/flyteagent/README.md b/charts/flyteagent/README.md index 10f65508f1..523312ac17 100644 --- a/charts/flyteagent/README.md +++ b/charts/flyteagent/README.md @@ -35,3 +35,4 @@ A Helm chart for Flyte agent | serviceAccount.create | bool | `true` | Should a service account be created for flyteagent | | serviceAccount.imagePullSecrets | list | `[]` | ImagePullSecrets to automatically assign to the service account | | tolerations | list | `[]` | tolerations for flyteagent deployment | + diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml index d8a17beaa7..cf20d9ccf1 100644 --- a/docker/sandbox-bundled/manifests/complete.yaml +++ b/docker/sandbox-bundled/manifests/complete.yaml @@ -497,6 +497,17 @@ data: signedURL: stowConfigOverride: endpoint: http://localhost:30002 + task_resources: + defaults: + cpu: 500m + ephemeralStorage: 0 + gpu: 0 + memory: 1Gi + limits: + cpu: 0 + ephemeralStorage: 0 + gpu: 0 + memory: 0 kind: ConfigMap metadata: labels: @@ -784,7 +795,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: eG45SEN5TVVWa0x6T1JWag== + haSharedSecret: TGdrZ2VYQmlCclY1RExvUw== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1182,7 +1193,7 @@ spec: metadata: annotations: checksum/cluster-resource-templates: 6fd9b172465e3089fcc59f738b92b8dc4d8939360c19de8ee65f68b0e7422035 - checksum/configuration: d8b1a21ee36b95a27cb4311ea41bd4bb660b4306ce89a99ed66f4f0425c35084 + checksum/configuration: 2bc4d1f1b07e67182a10a59b5eeb2c8dda57d8f0d98d3869fa6e773518690cac checksum/configuration-secret: 09216ffaa3d29e14f88b1f30af580d02a2a5e014de4d750b7f275cc07ed4e914 labels: app.kubernetes.io/component: flyte-binary @@ -1345,7 +1356,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: d88b59ccf4d3a3d572d09451cda92c24362f858e9d4a18db02c5e3ac00fa39bf + checksum/secret: 34825f00a546f73cde04e45e718db7db8a29791c6ef58537f56f9270ee81dc01 labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml index 055a70de41..20c5f697a2 100644 --- a/docker/sandbox-bundled/manifests/dev.yaml +++ b/docker/sandbox-bundled/manifests/dev.yaml @@ -499,7 +499,7 @@ metadata: --- apiVersion: v1 data: - haSharedSecret: ajZKUE5Ddm5HRHhmcVpIYg== + haSharedSecret: Z2ZnWkdRNVI0VFBBd3JPQg== proxyPassword: "" proxyUsername: "" kind: Secret @@ -933,7 +933,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 989c2369d62af38b41b73878e06ff95b0d60ed64d38c055bae4c5abd47e40dae + checksum/secret: 12ce3d2a71b191032acdc8fc14085540cf192208f4bb213ec39a2ff2b3862d88 labels: app: docker-registry release: flyte-sandbox