Use Constants in ChildReferences

Prior to this commit, the APIVersion and Kind fields used different variables depending on where they were used. In this cleanup, they use the same constants everywhere.
tektoncd · Jun 23, 2022 · 9d580cc · 9d580cc
1 parent a84f97e
commit 9d580cc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/reconciler/pipelinerun/pipelinerun.go b/pkg/reconciler/pipelinerun/pipelinerun.go
@@ -1398,7 +1398,7 @@ func updatePipelineRunStatusFromChildRefs(logger *zap.SugaredLogger, pr *v1beta1
 			childRefByName[tr.Name] = &v1beta1.ChildStatusReference{
 				TypeMeta: runtime.TypeMeta{
 					APIVersion: v1beta1.SchemeGroupVersion.String(),
-					Kind:       "TaskRun",
+					Kind:       pipeline.TaskRunControllerName,
 				},
 				Name:             tr.Name,
 				PipelineTaskName: pipelineTaskName,
@@ -1420,7 +1420,7 @@ func updatePipelineRunStatusFromChildRefs(logger *zap.SugaredLogger, pr *v1beta1
 			childRefByName[r.Name] = &v1beta1.ChildStatusReference{
 				TypeMeta: runtime.TypeMeta{
 					APIVersion: v1alpha1.SchemeGroupVersion.String(),
-					Kind:       "Run",
+					Kind:       pipeline.RunControllerName,
 				},
 				Name:             r.Name,
 				PipelineTaskName: pipelineTaskName,

diff --git a/pkg/reconciler/pipelinerun/resources/pipelinerunstate.go b/pkg/reconciler/pipelinerun/resources/pipelinerunstate.go
@@ -262,7 +262,7 @@ func (state PipelineRunState) GetChildReferences() []v1beta1.ChildStatusReferenc
 func (rprt *ResolvedPipelineRunTask) getChildRefForRun() v1beta1.ChildStatusReference {
 	return v1beta1.ChildStatusReference{
 		TypeMeta: runtime.TypeMeta{
-			APIVersion: rprt.Run.APIVersion,
+			APIVersion: v1alpha1.SchemeGroupVersion.String(),
 			Kind:       pipeline.RunControllerName,
 		},
 		Name:             rprt.RunName,
@@ -274,7 +274,7 @@ func (rprt *ResolvedPipelineRunTask) getChildRefForRun() v1beta1.ChildStatusRefe
 func (rprt *ResolvedPipelineRunTask) getChildRefForTaskRun(taskRun *v1beta1.TaskRun) v1beta1.ChildStatusReference {
 	return v1beta1.ChildStatusReference{
 		TypeMeta: runtime.TypeMeta{
-			APIVersion: taskRun.APIVersion,
+			APIVersion: v1beta1.SchemeGroupVersion.String(),
 			Kind:       pipeline.TaskRunControllerName,
 		},
 		Name:             taskRun.Name,