Misc fixes

Signed-off-by: Jeev B <[email protected]>
flyteorg · Nov 10, 2023 · ac2929e · ac2929e
1 parent d774b1d
commit ac2929e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/flyteplugins/go/tasks/plugins/k8s/ray/config.go b/flyteplugins/go/tasks/plugins/k8s/ray/config.go
@@ -82,7 +82,7 @@ type Config struct {
 	RemoteClusterConfig  pluginmachinery.ClusterConfig `json:"remoteClusterConfig" pflag:"Configuration of remote K8s cluster for ray jobs"`
 	Logs                 logs.LogConfig                `json:"logs" pflag:"-,Log configuration for ray jobs"`
 	LogsSidecar          *v1.Container                 `json:"logsSidecar" pflag:"-,Sidecar to inject into head pods for capturing ray job logs"`
-	DashboardUrlTemplate *tasklog.TemplateLogPlugin    `json:"dashboardUrlTemplate" pflag:",Template for URL of Ray dashboard running on a head node."`
+	DashboardUrlTemplate *tasklog.TemplateLogPlugin    `json:"dashboardURLTemplate" pflag:",Template for URL of Ray dashboard running on a head node."`
 	Defaults             DefaultConfig                 `json:"defaults" pflag:"-,Default configuration for ray jobs"`
 	EnableUsageStats     bool                          `json:"enableUsageStats" pflag:",Enable usage stats for ray jobs. These stats are submitted to usage-stats.ray.io per https://docs.ray.io/en/latest/cluster/usage-stats.html"`
 }

diff --git a/flyteplugins/go/tasks/plugins/k8s/ray/ray.go b/flyteplugins/go/tasks/plugins/k8s/ray/ray.go
@@ -438,10 +438,6 @@ func getEventInfoForRayJob(logConfig logs.LogConfig, pluginContext k8s.PluginCon
 		return nil, fmt.Errorf("failed to initialize log plugins. Error: %w", err)
 	}
 
-	if logPlugin == nil {
-		return nil, nil
-	}
-
 	var taskLogs []*core.TaskLog
 
 	taskExecID := pluginContext.TaskExecutionMetadata().GetTaskExecutionID()
@@ -459,15 +455,15 @@ func getEventInfoForRayJob(logConfig logs.LogConfig, pluginContext k8s.PluginCon
 	taskLogs = append(taskLogs, logOutput.TaskLogs...)
 
 	// Handling for Ray Dashboard
-	dashboardUrlTemplate := GetConfig().DashboardUrlTemplate
-	if dashboardUrlTemplate != nil &&
+	dashboardURLTemplate := GetConfig().DashboardUrlTemplate
+	if dashboardURLTemplate != nil &&
 		rayJob.Status.DashboardURL != "" &&
 		rayJob.Status.JobStatus == rayv1alpha1.JobStatusRunning {
-		dashboardUrlOutput, err := dashboardUrlTemplate.GetTaskLogs(input)
+		dashboardURLOutput, err := dashboardURLTemplate.GetTaskLogs(input)
 		if err != nil {
 			return nil, fmt.Errorf("failed to generate Ray dashboard link. Error: %w", err)
 		}
-		taskLogs = append(taskLogs, dashboardUrlOutput.TaskLogs...)
+		taskLogs = append(taskLogs, dashboardURLOutput.TaskLogs...)
 	}
 
 	return &pluginsCore.TaskInfo{Logs: taskLogs}, nil