Ray Plugin - Use serviceAccount from Config if set

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 <https://grafana.com/grafana/dashboards/22146-flyte-user-dashboard-via-prometheus/>`__ 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 <https://grafana.com/grafana/dashboards/21719-flyte-propeller-dashboard-via-prometheus/>`__: execution engine status and performance.
-        - Control plane (``flyteadmin``): `21720 <https://grafana.com/grafana/dashboards/21720-flyteadmin-dashboard-via-prometheus/>`__: API-level monitoring.
+        - Data plane (``flytepropeller``) - `21719 <https://grafana.com/grafana/dashboards/21719-flyte-propeller-dashboard-via-prometheus/>`__: execution engine status and performance.
+        - Control plane (``flyteadmin``) - `21720 <https://grafana.com/grafana/dashboards/21720-flyteadmin-dashboard-via-prometheus/>`__: API-level monitoring.
 
 The corresponding JSON files for each dashboard are also located in the ``flyte`` repository at `deployment/stats/prometheus <https://github.com/flyteorg/flyte/tree/master/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::
 

flyteplugins/go/tasks/plugins/k8s/ray/config.go

@@ -22,11 +22,11 @@ var (
 		IncludeDashboard:         true,
 		DashboardHost:            "0.0.0.0",
 		EnableUsageStats:         false,
-		ServiceAccount:           "default",
+		ServiceAccount:           "",
 		Defaults: DefaultConfig{
 			HeadNode: NodeConfig{
 				StartParameters: map[string]string{
-					// Disable usage reporting by default: https://docs.ray.io/en/latest/cluster/usage-stats.html
+					// Disable usage reporting by default: https://docs.ray.io/en/latest/cluster/deusage-stats.html
 					DisableUsageStatsStartParameter: "true",
 				},
 				IPAddress: "$MY_POD_IP",

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, "")
 	})
 }

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
 	}