Undo changes in template.go from rebase

Signed-off-by: Fabio Graetz <[email protected]>
flyteorg · Jan 14, 2024 · 4bbdd6d · 4bbdd6d
1 parent 8be78ea
commit 4bbdd6d
Showing 1 changed file with 14 additions and 10 deletions.
diff --git a/flyteplugins/go/tasks/pluginmachinery/tasklog/template.go b/flyteplugins/go/tasks/pluginmachinery/tasklog/template.go
@@ -113,16 +113,6 @@ func (input Input) templateVarsForScheme(scheme TemplateScheme) TemplateVars {
 			TemplateVar{defaultRegexes.ContainerName, input.ContainerName},
 			TemplateVar{defaultRegexes.ContainerID, containerID},
 			TemplateVar{defaultRegexes.Hostname, input.HostName},
-			TemplateVar{defaultRegexes.PodRFC3339StartTime, input.PodRFC3339StartTime},
-			TemplateVar{defaultRegexes.PodRFC3339FinishTime, input.PodRFC3339FinishTime},
-			TemplateVar{
-				defaultRegexes.PodUnixStartTime,
-				strconv.FormatInt(input.PodUnixStartTime, 10),
-			},
-			TemplateVar{
-				defaultRegexes.PodUnixFinishTime,
-				strconv.FormatInt(input.PodUnixFinishTime, 10),
-			},
 		)
 		if gotExtraTemplateVars {
 			vars = append(vars, input.ExtraTemplateVarsByScheme.Pod...)
@@ -187,6 +177,20 @@ func (input Input) templateVarsForScheme(scheme TemplateScheme) TemplateVars {
 		}
 	}
 
+	vars = append(
+		vars,
+		TemplateVar{defaultRegexes.PodRFC3339StartTime, input.PodRFC3339StartTime},
+		TemplateVar{defaultRegexes.PodRFC3339FinishTime, input.PodRFC3339FinishTime},
+		TemplateVar{
+			defaultRegexes.PodUnixStartTime,
+			strconv.FormatInt(input.PodUnixStartTime, 10),
+		},
+		TemplateVar{
+			defaultRegexes.PodUnixFinishTime,
+			strconv.FormatInt(input.PodUnixFinishTime, 10),
+		},
+	)
+
 	return vars
 }