diff --git a/docs/deployment/configuration/monitoring.rst b/docs/deployment/configuration/monitoring.rst
index 449c147754..1e9e26763e 100644
--- a/docs/deployment/configuration/monitoring.rst
+++ b/docs/deployment/configuration/monitoring.rst
@@ -90,8 +90,8 @@ Both ``flyteadmin`` and ``flytepropeller`` are instrumented to expose metrics. T
- **User-facing dashboard**: it can be used to investigate performance and characteristics of workflow and task executions. It's published under ID `22146 `__ in the Grafana marketplace.
- **System Dashboards**: Dashboards that are useful for the system maintainer to investigate the status and performance of their Flyte deployments. These are further divided into:
- - Data plane (``flytepropeller``): `21719 `__: execution engine status and performance.
- - Control plane (``flyteadmin``): `21720 `__: API-level monitoring.
+ - Data plane (``flytepropeller``) - `21719 `__: execution engine status and performance.
+ - Control plane (``flyteadmin``) - `21720 `__: API-level monitoring.
The corresponding JSON files for each dashboard are also located in the ``flyte`` repository at `deployment/stats/prometheus `__.
@@ -133,7 +133,7 @@ Once the prerequisites are in place, follow the instructions in this section to
service:
enabled: true
- The above configuration enables the ``serviceMonitor`` that Prometheus can then use to automatically discover services and scrape metrics from them.
+ The above configuration enables the ``serviceMonitor`` that Prometheus can then use to automatically discover services and scrape metrics from them.
.. group-tab:: flyte-binary
@@ -157,7 +157,7 @@ Once the prerequisites are in place, follow the instructions in this section to
protocol: TCP
port: 10254
- The above configuration enables the ``serviceMonitor`` that Prometheus can then use to automatically discover services and scrape metrics from them.
+ The above configuration enables the ``serviceMonitor`` that Prometheus can then use to automatically discover services and scrape metrics from them.
.. note::
diff --git a/flyteplugins/go/tasks/plugins/k8s/ray/config.go b/flyteplugins/go/tasks/plugins/k8s/ray/config.go
index 9a05f98f25..3f79ed958e 100644
--- a/flyteplugins/go/tasks/plugins/k8s/ray/config.go
+++ b/flyteplugins/go/tasks/plugins/k8s/ray/config.go
@@ -22,7 +22,7 @@ var (
IncludeDashboard: true,
DashboardHost: "0.0.0.0",
EnableUsageStats: false,
- ServiceAccount: "default",
+ ServiceAccount: "",
Defaults: DefaultConfig{
HeadNode: NodeConfig{
StartParameters: map[string]string{
diff --git a/flyteplugins/go/tasks/plugins/k8s/ray/config_test.go b/flyteplugins/go/tasks/plugins/k8s/ray/config_test.go
index d19c047ca6..07b0c2842a 100644
--- a/flyteplugins/go/tasks/plugins/k8s/ray/config_test.go
+++ b/flyteplugins/go/tasks/plugins/k8s/ray/config_test.go
@@ -32,6 +32,6 @@ func TestLoadDefaultServiceAccountConfig(t *testing.T) {
t.Run("serviceAccount", func(t *testing.T) {
config := GetConfig()
- assert.Equal(t, config.ServiceAccount, "default")
+ assert.Equal(t, config.ServiceAccount, "")
})
}
diff --git a/flyteplugins/go/tasks/plugins/k8s/ray/ray.go b/flyteplugins/go/tasks/plugins/k8s/ray/ray.go
index 95a87f4efa..9b10719033 100644
--- a/flyteplugins/go/tasks/plugins/k8s/ray/ray.go
+++ b/flyteplugins/go/tasks/plugins/k8s/ray/ray.go
@@ -190,7 +190,7 @@ func constructRayJob(taskCtx pluginsCore.TaskExecutionContext, rayJob plugins.Ra
}
serviceAccountName := flytek8s.GetServiceAccountNameFromTaskExecutionMetadata(taskCtx.TaskExecutionMetadata())
- if len(serviceAccountName) == 0 {
+ if len(serviceAccountName) == 0 || cfg.ServiceAccount != "" {
serviceAccountName = cfg.ServiceAccount
}