diff --git a/flyteplugins/go/tasks/logs/logging_utils.go b/flyteplugins/go/tasks/logs/logging_utils.go index a82963a652..20f3522e27 100644 --- a/flyteplugins/go/tasks/logs/logging_utils.go +++ b/flyteplugins/go/tasks/logs/logging_utils.go @@ -113,7 +113,6 @@ func InitializeLogPlugins(cfg *LogConfig) (tasklog.Plugin, error) { if len(cfg.FlyinTemplateURI) > 0 { plugins = append(plugins, tasklog.TemplateLogPlugin{DisplayName: "Flyin Logs", Scheme: tasklog.TemplateSchemeFlyin, TemplateURIs: []tasklog.TemplateURI{cfg.FlyinTemplateURI}, MessageFormat: core.TaskLog_JSON}) } else { - // TODO: Figure out what to use a default here. plugins = append(plugins, tasklog.TemplateLogPlugin{DisplayName: "Flyin Logs", Scheme: tasklog.TemplateSchemeFlyin, TemplateURIs: []tasklog.TemplateURI{fmt.Sprintf("https://flyin.%s/logs/{{ .namespace }}/{{ .podName }}/{{ .containerName }}/{{ .containerId }}", cfg.GCPProjectName)}, MessageFormat: core.TaskLog_JSON}) } } diff --git a/flyteplugins/go/tasks/pluginmachinery/tasklog/template.go b/flyteplugins/go/tasks/pluginmachinery/tasklog/template.go index 89d9d1ce18..ea5c5f373c 100644 --- a/flyteplugins/go/tasks/pluginmachinery/tasklog/template.go +++ b/flyteplugins/go/tasks/pluginmachinery/tasklog/template.go @@ -88,14 +88,12 @@ func (input Input) templateVarsForScheme(scheme TemplateScheme) TemplateVars { switch scheme { case TemplateSchemeFlyin: - // TODO: Confirm that having a default port is okay. port := input.TaskTemplate.GetConfig()["port"] if port == "" { - port = "8081" + port = "8080" } vars = append( vars, - // Replace the port with the port from the task template. TemplateVar{defaultRegexes.Port, port}, ) fallthrough diff --git a/flyteplugins/go/tasks/pluginmachinery/tasklog/template_test.go b/flyteplugins/go/tasks/pluginmachinery/tasklog/template_test.go index 09637fb811..ad6eef25a3 100644 --- a/flyteplugins/go/tasks/pluginmachinery/tasklog/template_test.go +++ b/flyteplugins/go/tasks/pluginmachinery/tasklog/template_test.go @@ -583,7 +583,7 @@ func TestTemplateLogPlugin(t *testing.T) { Output{ TaskLogs: []*core.TaskLog{ { - Uri: "vscode://flyin:8081/my-pod-name", + Uri: "vscode://flyin:8080/my-pod-name", MessageFormat: core.TaskLog_JSON, }, },