Determine changeset from build information

This updates knative.dev/pkg to @main to pick up a recent change to make changeset.Get() determine the built version from information embedded in the binary, and no longer return an error. This also lets us remove symlinks for HEAD and refs in kodata, since they were only there to enable the previous changeset.Get() implementation.
vdemeester · Aug 17, 2022 · 27cb502 · 27cb502
1 parent 8413f85
commit 27cb502
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 51 deletions.
diff --git a/cmd/controller/kodata/HEAD b/cmd/controller/kodata/HEAD
diff --git a/cmd/controller/kodata/refs b/cmd/controller/kodata/refs
diff --git a/cmd/entrypoint/kodata/HEAD b/cmd/entrypoint/kodata/HEAD
diff --git a/cmd/entrypoint/kodata/refs b/cmd/entrypoint/kodata/refs
diff --git a/cmd/git-init/kodata/HEAD b/cmd/git-init/kodata/HEAD
diff --git a/cmd/git-init/kodata/refs b/cmd/git-init/kodata/refs
diff --git a/cmd/imagedigestexporter/kodata/HEAD b/cmd/imagedigestexporter/kodata/HEAD
diff --git a/cmd/imagedigestexporter/kodata/refs b/cmd/imagedigestexporter/kodata/refs
diff --git a/cmd/kubeconfigwriter/kodata/HEAD b/cmd/kubeconfigwriter/kodata/HEAD
diff --git a/cmd/kubeconfigwriter/kodata/refs b/cmd/kubeconfigwriter/kodata/refs
diff --git a/cmd/nop/kodata/HEAD b/cmd/nop/kodata/HEAD
diff --git a/cmd/nop/kodata/refs b/cmd/nop/kodata/refs
diff --git a/cmd/pullrequest-init/kodata/HEAD b/cmd/pullrequest-init/kodata/HEAD
diff --git a/cmd/pullrequest-init/kodata/refs b/cmd/pullrequest-init/kodata/refs
diff --git a/cmd/webhook/kodata/HEAD b/cmd/webhook/kodata/HEAD
diff --git a/cmd/webhook/kodata/refs b/cmd/webhook/kodata/refs
diff --git a/go.mod b/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

diff --git a/go.sum b/go.sum
diff --git a/pkg/pod/pod.go b/pkg/pod/pod.go
@@ -294,11 +294,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

diff --git a/pkg/reconciler/taskrun/taskrun.go b/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 {