Merge pull request #149 from buildkite/triarius/job_in_build_url

Author: triarius

api/api.go

@@ -12,6 +12,7 @@ const (
 	UUIDLabel          = "buildkite.com/job-uuid"
 	TagLabel           = "buildkite.com/job-tag"
 	BuildURLAnnotation = "buildkite.com/build-url"
+	JobURLAnnotation   = "buildkite.com/job-url"
 	DefaultNamespace   = "default"
 	DefaultAgentImage  = "ghcr.io/buildkite/agent-k8s:latest"
 )

internal/scheduler/scheduler.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/url"
 	"strconv"
 	"strings"
 
@@ -176,6 +177,8 @@ func (w *jobWrapper) Build() (*batchv1.Job, error) {
 	w.k8sPlugin.Metadata.Labels[api.UUIDLabel] = w.job.Uuid
 	w.k8sPlugin.Metadata.Labels[api.TagLabel] = api.TagToLabel(w.job.Tag)
 	w.k8sPlugin.Metadata.Annotations[api.BuildURLAnnotation] = w.envMap["BUILDKITE_BUILD_URL"]
+	w.annotateWithJobURL()
+
 	kjob.Labels = w.k8sPlugin.Metadata.Labels
 	kjob.Spec.Template.Labels = w.k8sPlugin.Metadata.Labels
 	kjob.Annotations = w.k8sPlugin.Metadata.Annotations
@@ -432,6 +435,17 @@ func (w *jobWrapper) BuildFailureJob(err error) (*batchv1.Job, error) {
 	return w.Build()
 }
 
+func (w *jobWrapper) annotateWithJobURL() {
+	buildURL := w.envMap["BUILDKITE_BUILD_URL"]
+	u, err := url.Parse(buildURL)
+	if err != nil {
+		w.logger.Warn("could not parse BuildURL when annotating with JobURL", zap.String("buildURL", buildURL))
+		return
+	}
+	u.Fragment = w.job.Uuid
+	w.k8sPlugin.Metadata.Annotations[api.JobURLAnnotation] = u.String()
+}
+
 func kjobName(job *monitor.Job) string {
 	return fmt.Sprintf("buildkite-%s", job.Uuid)
 }