From 784a9d9db62a47904bf812224afc6ff48e14b89d Mon Sep 17 00:00:00 2001 From: Jason Parraga Date: Mon, 26 Aug 2024 12:09:52 -0700 Subject: [PATCH] Update helm/docs per changes in supported task discovery Signed-off-by: Jason Parraga --- charts/flyte-core/README.md | 4 ++-- charts/flyte-core/values.yaml | 8 +++----- docker/sandbox-bundled/manifests/complete-agent.yaml | 4 ++-- docker/sandbox-bundled/manifests/complete.yaml | 4 ++-- docker/sandbox-bundled/manifests/dev.yaml | 4 ++-- docs/deployment/agents/airflow.rst | 9 --------- docs/deployment/agents/bigquery.rst | 9 --------- docs/deployment/agents/chatgpt.rst | 4 ---- docs/deployment/agents/databricks.rst | 12 ------------ docs/deployment/agents/mmcloud.rst | 2 -- docs/deployment/agents/openai_batch.rst | 8 -------- docs/deployment/agents/sagemaker_inference.rst | 10 ---------- docs/deployment/agents/sensor.rst | 9 --------- docs/deployment/agents/snowflake.rst | 9 --------- .../generated/flytepropeller_config.rst | 3 --- docs/flyte_agents/developing_agents.md | 6 +----- 16 files changed, 12 insertions(+), 93 deletions(-) diff --git a/charts/flyte-core/README.md b/charts/flyte-core/README.md index 673ba7b6ef..ba11205264 100644 --- a/charts/flyte-core/README.md +++ b/charts/flyte-core/README.md @@ -195,11 +195,11 @@ helm install gateway bitnami/contour -n flyte | flyteadmin.serviceMonitor.scrapeTimeout | string | `"30s"` | Sets the timeout after which request to scrape metrics will time out | | flyteadmin.tolerations | list | `[]` | tolerations for Flyteadmin deployment | | flyteagent.enabled | bool | `false` | | -| flyteagent.plugin_config.plugins.agent-service | object | `{"defaultAgent":{"endpoint":"dns:///flyteagent.flyte.svc.cluster.local:8000","insecure":true},"supportedTaskTypes":["sensor"]}` | Agent service configuration for propeller. | +| flyteagent.plugin_config.plugins.agent-service | object | `{"defaultAgent":{"endpoint":"dns:///flyteagent.flyte.svc.cluster.local:8000","insecure":true},"supportedTaskTypes":[]}` | Agent service configuration for propeller. | | flyteagent.plugin_config.plugins.agent-service.defaultAgent | object | `{"endpoint":"dns:///flyteagent.flyte.svc.cluster.local:8000","insecure":true}` | The default agent service to use for plugin tasks. | | flyteagent.plugin_config.plugins.agent-service.defaultAgent.endpoint | string | `"dns:///flyteagent.flyte.svc.cluster.local:8000"` | The agent service endpoint propeller should connect to. | | flyteagent.plugin_config.plugins.agent-service.defaultAgent.insecure | bool | `true` | Whether the connection from propeller to the agent service should use TLS. | -| flyteagent.plugin_config.plugins.agent-service.supportedTaskTypes | list | `["sensor"]` | The task types supported by the default agent. | +| flyteagent.plugin_config.plugins.agent-service.supportedTaskTypes | list | `[]` | The task types supported by the default agent. As of #5460 these are discovered automatically and don't need to be configured. | | flyteagent.podLabels | object | `{}` | Labels for flyteagent pods | | flyteconsole.affinity | object | `{}` | affinity for Flyteconsole deployment | | flyteconsole.enabled | bool | `true` | | diff --git a/charts/flyte-core/values.yaml b/charts/flyte-core/values.yaml index 93c0d9b389..7442222e9b 100755 --- a/charts/flyte-core/values.yaml +++ b/charts/flyte-core/values.yaml @@ -287,11 +287,9 @@ flyteagent: endpoint: "dns:///flyteagent.flyte.svc.cluster.local:8000" # -- Whether the connection from propeller to the agent service should use TLS. insecure: true - # -- The task types supported by the default agent. - supportedTaskTypes: - - sensor - # -- Uncomment to enable task type that uses Flyte Agent - # - bigquery_query_job_task + # -- The task types supported by the default agent. As of #5460 these are discovered automatically and don't + # need to be configured. + supportedTaskTypes: [] # -- Labels for flyteagent pods podLabels: {} diff --git a/docker/sandbox-bundled/manifests/complete-agent.yaml b/docker/sandbox-bundled/manifests/complete-agent.yaml index 78a678ae34..240fbf02e8 100644 --- a/docker/sandbox-bundled/manifests/complete-agent.yaml +++ b/docker/sandbox-bundled/manifests/complete-agent.yaml @@ -818,7 +818,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: cWlOc1c1bnl5ZGI3YTlzSw== + haSharedSecret: VG5tSVA4dFVTSllHNW9sUw== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1415,7 +1415,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: 7f8247a0b84f43018fdf11a598132b8a67ed9fde6573ffce801b725a6f955012 + checksum/secret: 65272a27909e580e3320202d6df96de7b07a6d0b2a4e262117d1411f4cf866a8 labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/complete.yaml b/docker/sandbox-bundled/manifests/complete.yaml index 5d46b89edf..2c03404ede 100644 --- a/docker/sandbox-bundled/manifests/complete.yaml +++ b/docker/sandbox-bundled/manifests/complete.yaml @@ -798,7 +798,7 @@ type: Opaque --- apiVersion: v1 data: - haSharedSecret: UUxqaW5SeGlBbFNlQzVoag== + haSharedSecret: VGtUcGhoS1pSRlZ4Z0pXMg== proxyPassword: "" proxyUsername: "" kind: Secret @@ -1362,7 +1362,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: bea0c8f293b54e309a353e0e8563e709ad817d372d2b1dce1114188693aa3f12 + checksum/secret: 4d73c91113fad0d9f1a0fde9ee9907dde341f7ff960d5188bdbb0ba3295f1aec labels: app: docker-registry release: flyte-sandbox diff --git a/docker/sandbox-bundled/manifests/dev.yaml b/docker/sandbox-bundled/manifests/dev.yaml index 917645af33..e1fc8cee5c 100644 --- a/docker/sandbox-bundled/manifests/dev.yaml +++ b/docker/sandbox-bundled/manifests/dev.yaml @@ -499,7 +499,7 @@ metadata: --- apiVersion: v1 data: - haSharedSecret: ZmdJNWs5RUg4cWNVTVBzRw== + haSharedSecret: ekF3MEJyaEM5VldMQjNlSA== proxyPassword: "" proxyUsername: "" kind: Secret @@ -934,7 +934,7 @@ spec: metadata: annotations: checksum/config: 8f50e768255a87f078ba8b9879a0c174c3e045ffb46ac8723d2eedbe293c8d81 - checksum/secret: a896f2c43dff6c05c154b51e4c9ec21c9e2f03ecaf4c1fed045d84523219cf63 + checksum/secret: 73fdaea677f5ecf6871dd895835b7ce9709a5e72e218680c82fd6c2cc62c40d0 labels: app: docker-registry release: flyte-sandbox diff --git a/docs/deployment/agents/airflow.rst b/docs/deployment/agents/airflow.rst index ad6a6dab36..158da5b8af 100644 --- a/docs/deployment/agents/airflow.rst +++ b/docs/deployment/agents/airflow.rst @@ -35,11 +35,6 @@ Specify agent configuration - container_array: k8s-array - airflow: agent-service - plugins: - agent-service: - supportedTaskTypes: - - airflow - .. group-tab:: Flyte core Create a file named ``values-override.yaml`` and add the following configuration to it. @@ -63,10 +58,6 @@ Specify agent configuration sidecar: sidecar container_array: k8s-array airflow: agent-service - plugins: - agent-service: - supportedTaskTypes: - - airflow Upgrade the Flyte Helm release diff --git a/docs/deployment/agents/bigquery.rst b/docs/deployment/agents/bigquery.rst index d3e4ee490e..31b8393d76 100644 --- a/docs/deployment/agents/bigquery.rst +++ b/docs/deployment/agents/bigquery.rst @@ -42,11 +42,6 @@ Specify agent configuration - container: container - container_array: k8s-array - bigquery_query_job_task: agent-service - - plugins: - agent-service: - supportedTaskTypes: - - bigquery_query_job_task .. group-tab:: Flyte core @@ -71,10 +66,6 @@ Specify agent configuration sidecar: sidecar container_array: k8s-array bigquery_query_job_task: agent-service - plugins: - agent-service: - supportedTaskTypes: - - bigquery_query_job_task Ensure that the propeller has the correct service account for BigQuery. diff --git a/docs/deployment/agents/chatgpt.rst b/docs/deployment/agents/chatgpt.rst index afc569222f..918bc821fb 100644 --- a/docs/deployment/agents/chatgpt.rst +++ b/docs/deployment/agents/chatgpt.rst @@ -36,8 +36,6 @@ Specify agent configuration plugins: agent-service: - supportedTaskTypes: - - chatgpt # Configuring the timeout is optional. # Tasks like using ChatGPT with a large model might require a longer time, # so we have the option to adjust the timeout setting here. @@ -70,8 +68,6 @@ Specify agent configuration chatgpt: agent-service plugins: agent-service: - supportedTaskTypes: - - chatgpt # Configuring the timeout is optional. # Tasks like using ChatGPT with a large model might require a longer time, # so we have the option to adjust the timeout setting here. diff --git a/docs/deployment/agents/databricks.rst b/docs/deployment/agents/databricks.rst index b21fab3c57..19d7e747c2 100644 --- a/docs/deployment/agents/databricks.rst +++ b/docs/deployment/agents/databricks.rst @@ -153,10 +153,6 @@ Specify agent configuration - sidecar - k8s-array - agent-service - plugins: - agent-service: - supportedTaskTypes: - - spark .. group-tab:: Helm chart @@ -176,10 +172,6 @@ Specify agent configuration - container: container - container_array: k8s-array - spark: agent-service - plugins: - agent-service: - supportedTaskTypes: - - spark .. group-tab:: Flyte core @@ -201,10 +193,6 @@ Specify agent configuration sidecar: sidecar container_array: k8s-array spark: agent-service - plugins: - agent-service: - supportedTaskTypes: - - spark Add the Databricks access token ------------------------------- diff --git a/docs/deployment/agents/mmcloud.rst b/docs/deployment/agents/mmcloud.rst index 422162af27..9ccb101aa2 100644 --- a/docs/deployment/agents/mmcloud.rst +++ b/docs/deployment/agents/mmcloud.rst @@ -71,8 +71,6 @@ Enable the MMCloud agent by adding the following config to the relevant YAML fil mmcloud-agent: endpoint: insecure: true - supportedTaskTypes: - - mmcloud_task agentForTaskTypes: - mmcloud_task: mmcloud-agent diff --git a/docs/deployment/agents/openai_batch.rst b/docs/deployment/agents/openai_batch.rst index 7aff9d262e..0e3d78bc30 100644 --- a/docs/deployment/agents/openai_batch.rst +++ b/docs/deployment/agents/openai_batch.rst @@ -32,10 +32,6 @@ Specify agent configuration - container: container - container_array: k8s-array - openai-batch: agent-service - plugins: - agent-service: - supportedTaskTypes: - - openai-batch .. group-tab:: Flyte core @@ -58,10 +54,6 @@ Specify agent configuration sidecar: sidecar container_array: k8s-array openai-batch: agent-service - plugins: - agent-service: - supportedTaskTypes: - - openai-batch Add the OpenAI API token ------------------------ diff --git a/docs/deployment/agents/sagemaker_inference.rst b/docs/deployment/agents/sagemaker_inference.rst index 5ceb248c2d..fadb31af71 100644 --- a/docs/deployment/agents/sagemaker_inference.rst +++ b/docs/deployment/agents/sagemaker_inference.rst @@ -33,11 +33,6 @@ Specify agent configuration - container_array: k8s-array - boto: agent-service - sagemaker-endpoint: agent-service - plugins: - agent-service: - supportedTaskTypes: - - boto - - sagemaker-endpoint .. group-tab:: Flyte core @@ -61,11 +56,6 @@ Specify agent configuration container_array: k8s-array boto: agent-service sagemaker-endpoint: agent-service - plugins: - agent-service: - supportedTaskTypes: - - boto - - sagemaker-endpoint AWS credentials --------------- diff --git a/docs/deployment/agents/sensor.rst b/docs/deployment/agents/sensor.rst index 958e5d896a..c21fbde617 100644 --- a/docs/deployment/agents/sensor.rst +++ b/docs/deployment/agents/sensor.rst @@ -69,11 +69,6 @@ Enable the sensor agent by adding the following config to the relevant YAML file - container: container - container_array: k8s-array - sensor: agent-service - - plugins: - agent-service: - supportedTaskTypes: - - sensor .. group-tab:: Flyte core @@ -98,10 +93,6 @@ Enable the sensor agent by adding the following config to the relevant YAML file sidecar: sidecar container_array: k8s-array sensor: agent-service - plugins: - agent-service: - supportedTaskTypes: - - sensor Upgrade the deployment diff --git a/docs/deployment/agents/snowflake.rst b/docs/deployment/agents/snowflake.rst index d6ee74125b..b806815e6e 100644 --- a/docs/deployment/agents/snowflake.rst +++ b/docs/deployment/agents/snowflake.rst @@ -49,11 +49,6 @@ Specify agent configuration - container_array: k8s-array - snowflake: agent-service - plugins: - agent-service: - supportedTaskTypes: - - snowflake - .. group-tab:: Flyte core Create a file named ``values-override.yaml`` and add the following configuration to it. @@ -77,10 +72,6 @@ Specify agent configuration sidecar: sidecar container_array: k8s-array snowflake: agent-service - plugins: - agent-service: - supportedTaskTypes: - - snowflake Ensure that the propeller has the correct service account for Snowflake. diff --git a/docs/deployment/configuration/generated/flytepropeller_config.rst b/docs/deployment/configuration/generated/flytepropeller_config.rst index be6f7ee7f0..554ebec849 100644 --- a/docs/deployment/configuration/generated/flytepropeller_config.rst +++ b/docs/deployment/configuration/generated/flytepropeller_config.rst @@ -994,9 +994,6 @@ agent-service (`agent.Config`_) Value: 50 ProjectScopeResourceConstraint: Value: 100 - supportedTaskTypes: - - task_type_1 - - task_type_2 webApi: caching: maxSystemFailures: 5 diff --git a/docs/flyte_agents/developing_agents.md b/docs/flyte_agents/developing_agents.md index ee989b812f..fd310088ef 100644 --- a/docs/flyte_agents/developing_agents.md +++ b/docs/flyte_agents/developing_agents.md @@ -197,10 +197,6 @@ you can route particular task requests to designated agent services by adjusting ```yaml plugins: agent-service: - supportedTaskTypes: - - bigquery_query_job_task - - default_task - - custom_task # By default, all requests will be sent to the default agent. defaultAgent: endpoint: "dns:///flyteagent.flyte.svc.cluster.local:8000" @@ -224,4 +220,4 @@ you can route particular task requests to designated agent services by adjusting agentForTaskTypes: # It will override the default agent for custom_task, which means propeller will send the request to this agent. - custom_task: custom_agent -``` \ No newline at end of file +```