Determine changeset from build information

go.mod

@@ -22,13 +22,13 @@ require (
 	go.uber.org/zap v1.21.0
 	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
 	gomodules.xyz/jsonpatch/v2 v2.2.0
-	k8s.io/api v0.23.8
-	k8s.io/apimachinery v0.23.8
-	k8s.io/client-go v0.23.8
-	k8s.io/code-generator v0.23.8
+	k8s.io/api v0.23.9
+	k8s.io/apimachinery v0.23.9
+	k8s.io/client-go v0.23.9
+	k8s.io/code-generator v0.23.9
 	k8s.io/klog v1.0.0
 	k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf
-	knative.dev/pkg v0.0.0-20220705130606-e60d250dc637
+	knative.dev/pkg v0.0.0-20220805012121-7b8b06028e4f
 	sigs.k8s.io/yaml v1.3.0
 )
 
@@ -144,9 +144,9 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.23.8 // indirect
-	k8s.io/gengo v0.0.0-20220307231824-4627b89bbf1b // indirect
-	k8s.io/klog/v2 v2.60.1-0.20220317184644-43cc75f9ae89 // indirect
+	k8s.io/apiextensions-apiserver v0.23.9 // indirect
+	k8s.io/gengo v0.0.0-20220613173612-397b4ae3bce7 // indirect
+	k8s.io/klog/v2 v2.70.2-0.20220707122935-0990e81f1a8f // indirect
 	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
 	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect

pkg/pod/pod.go

@@ -290,11 +290,7 @@ func (b *Builder) Build(ctx context.Context, taskRun *v1beta1.TaskRun, taskSpec
 	}
 
 	podAnnotations := kmeta.CopyMap(taskRun.Annotations)
-	version, err := changeset.Get()
-	if err != nil {
-		return nil, err
-	}
-	podAnnotations[ReleaseAnnotation] = version
+	podAnnotations[ReleaseAnnotation] = changeset.Get()
 
 	if readyImmediately {
 		podAnnotations[readyAnnotation] = readyAnnotationValue

pkg/reconciler/taskrun/taskrun.go

@@ -552,14 +552,10 @@ func (c *Reconciler) updateTaskRunWithDefaultWorkspaces(ctx context.Context, tr
 
 func (c *Reconciler) updateLabelsAndAnnotations(ctx context.Context, tr *v1beta1.TaskRun) (*v1beta1.TaskRun, error) {
 	// Ensure the TaskRun is properly decorated with the version of the Tekton controller processing it.
-	version, err := changeset.Get()
-	if err != nil {
-		return nil, err
-	}
 	if tr.Annotations == nil {
 		tr.Annotations = make(map[string]string, 1)
 	}
-	tr.Annotations[podconvert.ReleaseAnnotation] = version
+	tr.Annotations[podconvert.ReleaseAnnotation] = changeset.Get()
 
 	newTr, err := c.taskRunLister.TaskRuns(tr.Namespace).Get(tr.Name)
 	if err != nil {

pkg/reconciler/taskrun/taskrun_test.go

@@ -417,7 +417,7 @@ var (
 	}
 )
 
-const fakeVersion string = "a728ce3"
+const fakeVersion string = "unknown"
 
 func placeToolsInitContainer(steps []string) corev1.Container {
 	return corev1.Container{

test/taskrun_test.go

@@ -128,8 +128,8 @@ spec:
 	}
 
 	releaseAnnotation, ok := taskrun.Annotations[pod.ReleaseAnnotation]
-	// This should always contain a commit truncated to ~7 characters (based on knative.dev/pkg/changeset)
-	commitIDRegexp := regexp.MustCompile(`^[a-f0-9]{7}$`)
+	// This should always contain a commit truncated to 7 characters, possibly with "-dirty" suffix (based on knative.dev/pkg/changeset)
+	commitIDRegexp := regexp.MustCompile(`^[a-f0-9]{7}(-dirty)?$`)
 	if !ok || !commitIDRegexp.MatchString(releaseAnnotation) {
 		t.Fatalf("expected Taskrun to be annotated with %s=devel or with nightly release tag, got %s=%s", pod.ReleaseAnnotation, pod.ReleaseAnnotation, releaseAnnotation)
 	}