From fae594e452d8ce1634de0e20b07e3c5b4abf2173 Mon Sep 17 00:00:00 2001 From: pritidesai Date: Thu, 12 Aug 2021 21:47:56 -0700 Subject: [PATCH] cleaning up label keys We have defined GroupName as a constant which is set to tekon.dev in register.go. We have other label keys defined in the same go file which are used by the controller to set the appropriate labels. These keys are TaskLabelKey, PipelineLabelKey, etc. These keys are set to "/task", "/pipeline", etc. Now while adding such labels in the tekton resources, we join GroupName to the key. Instead, this commit changes the way we have defined a label key to include GroupName as part of the label key and use just the label key instead of concatinating while using the key. This cleansup the code and makes it simple to add tekton internal labels and retrieve them. --- pkg/apis/pipeline/register.go | 20 +- pkg/apis/pipeline/v1alpha1/taskrun_types.go | 4 +- .../pipeline/v1alpha1/taskrun_types_test.go | 4 +- pkg/apis/pipeline/v1beta1/taskrun_types.go | 4 +- .../pipeline/v1beta1/taskrun_types_test.go | 4 +- pkg/pod/pod.go | 5 +- pkg/pod/pod_test.go | 6 +- .../pipelinerun/affinity_assistant.go | 2 +- pkg/reconciler/pipelinerun/pipelinerun.go | 22 +- .../pipelinerun/pipelinerun_test.go | 250 +++++++++--------- pkg/reconciler/taskrun/metrics_test.go | 16 +- .../taskrun/resources/input_resources.go | 2 +- pkg/reconciler/taskrun/taskrun.go | 6 +- pkg/reconciler/taskrun/taskrun_test.go | 59 ++--- test/duplicate_test.go | 2 +- test/pipelinerun_test.go | 10 +- test/v1alpha1/duplicate_test.go | 2 +- test/v1alpha1/pipelinerun_test.go | 10 +- 18 files changed, 211 insertions(+), 217 deletions(-) diff --git a/pkg/apis/pipeline/register.go b/pkg/apis/pipeline/register.go index 8a7c14ed345..97ee57fe8c8 100644 --- a/pkg/apis/pipeline/register.go +++ b/pkg/apis/pipeline/register.go @@ -23,35 +23,35 @@ const ( GroupName = "tekton.dev" // ClusterTaskLabelKey is used as the label identifier for a ClusterTask - ClusterTaskLabelKey = "/clusterTask" + ClusterTaskLabelKey = GroupName + "/clusterTask" // TaskLabelKey is used as the label identifier for a Task - TaskLabelKey = "/task" + TaskLabelKey = GroupName + "/task" // TaskRunLabelKey is used as the label identifier for a TaskRun - TaskRunLabelKey = "/taskRun" + TaskRunLabelKey = GroupName + "/taskRun" // PipelineLabelKey is used as the label identifier for a Pipeline - PipelineLabelKey = "/pipeline" + PipelineLabelKey = GroupName + "/pipeline" // PipelineRunLabelKey is used as the label identifier for a PipelineRun - PipelineRunLabelKey = "/pipelineRun" + PipelineRunLabelKey = GroupName + "/pipelineRun" // PipelineTaskLabelKey is used as the label identifier for a PipelineTask - PipelineTaskLabelKey = "/pipelineTask" + PipelineTaskLabelKey = GroupName + "/pipelineTask" // ConditionCheckKey is used as the label identifier for a ConditionCheck - ConditionCheckKey = "/conditionCheck" + ConditionCheckKey = GroupName + "/conditionCheck" // ConditionNameKey is used as the label identifier for a Condition - ConditionNameKey = "/conditionName" + ConditionNameKey = GroupName + "/conditionName" // RunKey is used as the label identifier for a Run - RunKey = "/run" + RunKey = GroupName + "/run" // MemberOfLabelKey is used as the label identifier for a PipelineTask // Set to Tasks/Finally depending on the position of the PipelineTask - MemberOfLabelKey = "/memberOf" + MemberOfLabelKey = GroupName + "/memberOf" ) var ( diff --git a/pkg/apis/pipeline/v1alpha1/taskrun_types.go b/pkg/apis/pipeline/v1alpha1/taskrun_types.go index 6b067ba7842..9e2570279a9 100644 --- a/pkg/apis/pipeline/v1alpha1/taskrun_types.go +++ b/pkg/apis/pipeline/v1alpha1/taskrun_types.go @@ -245,8 +245,8 @@ func (tr *TaskRun) IsPartOfPipeline() (bool, string, string) { return false, "", "" } - if pl, ok := tr.Labels[pipeline.GroupName+pipeline.PipelineLabelKey]; ok { - return true, pl, tr.Labels[pipeline.GroupName+pipeline.PipelineRunLabelKey] + if pl, ok := tr.Labels[pipeline.PipelineLabelKey]; ok { + return true, pl, tr.Labels[pipeline.PipelineRunLabelKey] } return false, "", "" diff --git a/pkg/apis/pipeline/v1alpha1/taskrun_types_test.go b/pkg/apis/pipeline/v1alpha1/taskrun_types_test.go index 329435d3514..bc3a80e192e 100644 --- a/pkg/apis/pipeline/v1alpha1/taskrun_types_test.go +++ b/pkg/apis/pipeline/v1alpha1/taskrun_types_test.go @@ -175,8 +175,8 @@ func TestTaskRunIsOfPipelinerun(t *testing.T) { }{{ name: "yes", tr: tb.TaskRun("taskrunname", - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, "pipeline"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, "pipelinerun"), + tb.TaskRunLabel(pipeline.PipelineLabelKey, "pipeline"), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, "pipelinerun"), ), expectedValue: true, expetectedPipeline: "pipeline", diff --git a/pkg/apis/pipeline/v1beta1/taskrun_types.go b/pkg/apis/pipeline/v1beta1/taskrun_types.go index 6e7703eec81..83bf22240c9 100644 --- a/pkg/apis/pipeline/v1beta1/taskrun_types.go +++ b/pkg/apis/pipeline/v1beta1/taskrun_types.go @@ -430,8 +430,8 @@ func (tr *TaskRun) IsPartOfPipeline() (bool, string, string) { return false, "", "" } - if pl, ok := tr.Labels[pipeline.GroupName+pipeline.PipelineLabelKey]; ok { - return true, pl, tr.Labels[pipeline.GroupName+pipeline.PipelineRunLabelKey] + if pl, ok := tr.Labels[pipeline.PipelineLabelKey]; ok { + return true, pl, tr.Labels[pipeline.PipelineRunLabelKey] } return false, "", "" diff --git a/pkg/apis/pipeline/v1beta1/taskrun_types_test.go b/pkg/apis/pipeline/v1beta1/taskrun_types_test.go index 932092ed86c..5ebbb59bffa 100644 --- a/pkg/apis/pipeline/v1beta1/taskrun_types_test.go +++ b/pkg/apis/pipeline/v1beta1/taskrun_types_test.go @@ -212,8 +212,8 @@ func TestTaskRunIsOfPipelinerun(t *testing.T) { tr: &v1beta1.TaskRun{ ObjectMeta: metav1.ObjectMeta{ Labels: map[string]string{ - pipeline.GroupName + pipeline.PipelineLabelKey: "pipeline", - pipeline.GroupName + pipeline.PipelineRunLabelKey: "pipelinerun", + pipeline.PipelineLabelKey: "pipeline", + pipeline.PipelineRunLabelKey: "pipelinerun", }, }, }, diff --git a/pkg/pod/pod.go b/pkg/pod/pod.go index ca31ebef466..53b9c69e7ec 100644 --- a/pkg/pod/pod.go +++ b/pkg/pod/pod.go @@ -35,9 +35,6 @@ import ( ) const ( - // TaskRunLabelKey is the name of the label added to the Pod to identify the TaskRun - TaskRunLabelKey = pipeline.GroupName + pipeline.TaskRunLabelKey - // TektonHermeticEnvVar is the env var we set in containers to indicate they should be run hermetically TektonHermeticEnvVar = "TEKTON_HERMETIC" @@ -356,7 +353,7 @@ func makeLabels(s *v1beta1.TaskRun) map[string]string { // NB: Set this *after* passing through TaskRun Labels. If the TaskRun // specifies this label, it should be overridden by this value. - labels[TaskRunLabelKey] = s.Name + labels[pipeline.TaskRunLabelKey] = s.Name return labels } diff --git a/pkg/pod/pod_test.go b/pkg/pod/pod_test.go index b4c43be3a4f..9c7cb118802 100644 --- a/pkg/pod/pod_test.go +++ b/pkg/pod/pod_test.go @@ -1806,9 +1806,9 @@ func TestPodBuildwithAlphaAPIEnabled(t *testing.T) { func TestMakeLabels(t *testing.T) { taskRunName := "task-run-name" want := map[string]string{ - TaskRunLabelKey: taskRunName, - "foo": "bar", - "hello": "world", + pipeline.TaskRunLabelKey: taskRunName, + "foo": "bar", + "hello": "world", } got := makeLabels(&v1beta1.TaskRun{ ObjectMeta: metav1.ObjectMeta{ diff --git a/pkg/reconciler/pipelinerun/affinity_assistant.go b/pkg/reconciler/pipelinerun/affinity_assistant.go index 350b3af04f2..b7808126a8c 100644 --- a/pkg/reconciler/pipelinerun/affinity_assistant.go +++ b/pkg/reconciler/pipelinerun/affinity_assistant.go @@ -115,7 +115,7 @@ func getStatefulSetLabels(pr *v1beta1.PipelineRun, affinityAssistantName string) for key, val := range pr.ObjectMeta.Labels { labels[key] = val } - labels[pipeline.GroupName+pipeline.PipelineRunLabelKey] = pr.Name + labels[pipeline.PipelineRunLabelKey] = pr.Name // LabelInstance is used to configure PodAffinity for all TaskRuns belonging to this Affinity Assistant // LabelComponent is used to configure PodAntiAffinity to other Affinity Assistants diff --git a/pkg/reconciler/pipelinerun/pipelinerun.go b/pkg/reconciler/pipelinerun/pipelinerun.go index 8d5574bbf3a..214732c5d49 100644 --- a/pkg/reconciler/pipelinerun/pipelinerun.go +++ b/pkg/reconciler/pipelinerun/pipelinerun.go @@ -352,7 +352,7 @@ func (c *Reconciler) reconcile(ctx context.Context, pr *v1beta1.PipelineRun, get for key, value := range pipelineMeta.Labels { pr.ObjectMeta.Labels[key] = value } - pr.ObjectMeta.Labels[pipeline.GroupName+pipeline.PipelineLabelKey] = pipelineMeta.Name + pr.ObjectMeta.Labels[pipeline.PipelineLabelKey] = pipelineMeta.Name // Propagate annotations from Pipeline to PipelineRun. if pr.ObjectMeta.Annotations == nil { @@ -940,22 +940,22 @@ func getTaskrunLabels(pr *v1beta1.PipelineRun, pipelineTaskName string, includeP labels[key] = val } } - labels[pipeline.GroupName+pipeline.PipelineRunLabelKey] = pr.Name + labels[pipeline.PipelineRunLabelKey] = pr.Name if pipelineTaskName != "" { - labels[pipeline.GroupName+pipeline.PipelineTaskLabelKey] = pipelineTaskName + labels[pipeline.PipelineTaskLabelKey] = pipelineTaskName } if pr.Status.PipelineSpec != nil { // check if a task is part of the "tasks" section, add a label to identify it during the runtime for _, f := range pr.Status.PipelineSpec.Tasks { if pipelineTaskName == f.Name { - labels[pipeline.GroupName+pipeline.MemberOfLabelKey] = v1beta1.PipelineTasks + labels[pipeline.MemberOfLabelKey] = v1beta1.PipelineTasks break } } // check if a task is part of the "finally" section, add a label to identify it during the runtime for _, f := range pr.Status.PipelineSpec.Finally { if pipelineTaskName == f.Name { - labels[pipeline.GroupName+pipeline.MemberOfLabelKey] = v1beta1.PipelineFinallyTasks + labels[pipeline.MemberOfLabelKey] = v1beta1.PipelineFinallyTasks break } } @@ -1133,8 +1133,8 @@ func (c *Reconciler) updateLabelsAndAnnotations(ctx context.Context, pr *v1beta1 func (c *Reconciler) makeConditionCheckContainer(ctx context.Context, rprt *resources.ResolvedPipelineRunTask, rcc *resources.ResolvedConditionCheck, pr *v1beta1.PipelineRun) (*v1beta1.ConditionCheck, error) { labels := getTaskrunLabels(pr, rprt.PipelineTask.Name, true) - labels[pipeline.GroupName+pipeline.ConditionCheckKey] = rcc.ConditionCheckName - labels[pipeline.GroupName+pipeline.ConditionNameKey] = rcc.Condition.Name + labels[pipeline.ConditionCheckKey] = rcc.ConditionCheckName + labels[pipeline.ConditionNameKey] = rcc.Condition.Name for key, value := range rcc.Condition.ObjectMeta.Labels { labels[key] = value @@ -1234,8 +1234,8 @@ func updatePipelineRunStatusFromTaskRuns(logger *zap.SugaredLogger, pr *v1beta1. continue } lbls := taskrun.GetLabels() - pipelineTaskName := lbls[pipeline.GroupName+pipeline.PipelineTaskLabelKey] - if _, ok := lbls[pipeline.GroupName+pipeline.ConditionCheckKey]; ok { + pipelineTaskName := lbls[pipeline.PipelineTaskLabelKey] + if _, ok := lbls[pipeline.ConditionCheckKey]; ok { // Save condition for looping over them after this if _, ok := conditionTaskRuns[pipelineTaskName]; !ok { // If it's the first condition taskrun, initialise the slice @@ -1284,7 +1284,7 @@ func updatePipelineRunStatusFromTaskRuns(logger *zap.SugaredLogger, pr *v1beta1. // The condition check was not found, so we need to add it // We only add the condition name, the status can now be gathered by the // normal reconcile process - if conditionName, ok := lbls[pipeline.GroupName+pipeline.ConditionNameKey]; ok { + if conditionName, ok := lbls[pipeline.ConditionNameKey]; ok { conditionChecks[foundTaskRun.Name] = &v1beta1.PipelineRunConditionCheckStatus{ ConditionName: fmt.Sprintf("%s-%s", conditionName, strconv.Itoa(i)), } @@ -1316,7 +1316,7 @@ func updatePipelineRunStatusFromRuns(logger *zap.SugaredLogger, pr *v1beta1.Pipe continue } lbls := run.GetLabels() - pipelineTaskName := lbls[pipeline.GroupName+pipeline.PipelineTaskLabelKey] + pipelineTaskName := lbls[pipeline.PipelineTaskLabelKey] if _, ok := pr.Status.Runs[run.Name]; !ok { // This run was missing from the status. pr.Status.Runs[run.Name] = &v1beta1.PipelineRunRunStatus{ diff --git a/pkg/reconciler/pipelinerun/pipelinerun_test.go b/pkg/reconciler/pipelinerun/pipelinerun_test.go index 31474920d5f..27d368c8428 100644 --- a/pkg/reconciler/pipelinerun/pipelinerun_test.go +++ b/pkg/reconciler/pipelinerun/pipelinerun_test.go @@ -404,8 +404,8 @@ func TestReconcile(t *testing.T) { ), tb.TaskRunLabel("tekton.dev/pipeline", "test-pipeline"), tb.TaskRunLabel("tekton.dev/pipelineRun", "test-pipeline-run-success"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineTaskLabelKey, "unit-test-1"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), + tb.TaskRunLabel(pipeline.PipelineTaskLabelKey, "unit-test-1"), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), tb.TaskRunSpec( tb.TaskRunTaskRef("unit-test-task"), tb.TaskRunServiceAccountName("test-sa"), @@ -515,10 +515,10 @@ func TestReconcile_CustomTask(t *testing.T) { BlockOwnerDeletion: &trueb, }}, Labels: map[string]string{ - "tekton.dev/pipeline": pipelineRunName, - "tekton.dev/pipelineRun": pipelineRunName, - "tekton.dev/pipelineTask": pipelineTaskName, - pipeline.GroupName + pipeline.MemberOfLabelKey: v1beta1.PipelineTasks, + "tekton.dev/pipeline": pipelineRunName, + "tekton.dev/pipelineRun": pipelineRunName, + "tekton.dev/pipelineTask": pipelineTaskName, + pipeline.MemberOfLabelKey: v1beta1.PipelineTasks, }, Annotations: map[string]string{}, }, @@ -576,10 +576,10 @@ func TestReconcile_CustomTask(t *testing.T) { BlockOwnerDeletion: &trueb, }}, Labels: map[string]string{ - "tekton.dev/pipeline": pipelineRunName, - "tekton.dev/pipelineRun": pipelineRunName, - "tekton.dev/pipelineTask": pipelineTaskName, - pipeline.GroupName + pipeline.MemberOfLabelKey: v1beta1.PipelineTasks, + "tekton.dev/pipeline": pipelineRunName, + "tekton.dev/pipelineRun": pipelineRunName, + "tekton.dev/pipelineTask": pipelineTaskName, + pipeline.MemberOfLabelKey: v1beta1.PipelineTasks, }, Annotations: map[string]string{}, }, @@ -647,10 +647,10 @@ func TestReconcile_CustomTask(t *testing.T) { BlockOwnerDeletion: &trueb, }}, Labels: map[string]string{ - "tekton.dev/pipeline": pipelineRunName, - "tekton.dev/pipelineRun": pipelineRunName, - "tekton.dev/pipelineTask": pipelineTaskName, - pipeline.GroupName + pipeline.MemberOfLabelKey: v1beta1.PipelineTasks, + "tekton.dev/pipeline": pipelineRunName, + "tekton.dev/pipelineRun": pipelineRunName, + "tekton.dev/pipelineTask": pipelineTaskName, + pipeline.MemberOfLabelKey: v1beta1.PipelineTasks, }, Annotations: map[string]string{ "pipeline.tekton.dev/affinity-assistant": getAffinityAssistantName("pipelinews", pipelineRunName), @@ -782,8 +782,8 @@ func TestReconcile_PipelineSpecTaskSpec(t *testing.T) { ), tb.TaskRunLabel("tekton.dev/pipeline", "test-pipeline"), tb.TaskRunLabel("tekton.dev/pipelineRun", "test-pipeline-run-success"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineTaskLabelKey, "unit-test-task-spec"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), + tb.TaskRunLabel(pipeline.PipelineTaskLabelKey, "unit-test-task-spec"), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), tb.TaskRunSpec(tb.TaskRunTaskSpec(tb.Step("myimage", tb.StepName("mystep"))), tb.TaskRunServiceAccountName(config.DefaultServiceAccountValue)), ) @@ -1024,7 +1024,7 @@ func TestReconcile_InvalidPipelineRuns(t *testing.T) { if reconciledRun.Spec.PipelineRef != nil { expectedPipelineLabel = reconciledRun.Spec.PipelineRef.Name } - expectedLabels := map[string]string{pipeline.GroupName + pipeline.PipelineLabelKey: expectedPipelineLabel} + expectedLabels := map[string]string{pipeline.PipelineLabelKey: expectedPipelineLabel} if len(reconciledRun.ObjectMeta.Labels) != len(expectedLabels) { t.Errorf("Expected labels : %v, got %v", expectedLabels, reconciledRun.ObjectMeta.Labels) } @@ -1390,8 +1390,8 @@ func TestReconcileOnCompletedPipelineRun(t *testing.T) { tb.TaskRun(taskRunName, tb.TaskRunNamespace("foo"), tb.TaskRunOwnerReference("kind", "name"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, "test-pipeline-run-completed"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, "test-pipeline"), + tb.TaskRunLabel(pipeline.PipelineLabelKey, "test-pipeline-run-completed"), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, "test-pipeline"), tb.TaskRunSpec(tb.TaskRunTaskRef("hello-world")), tb.TaskRunStatus( tb.StatusCondition(apis.Condition{ @@ -1478,8 +1478,8 @@ func TestReconcileOnCancelledPipelineRunDeprecated(t *testing.T) { tb.TaskRun("test-pipeline-run-cancelled-hello-world", tb.TaskRunNamespace("foo"), tb.TaskRunOwnerReference("kind", "name"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, "test-pipeline-run-cancelled"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, "test-pipeline"), + tb.TaskRunLabel(pipeline.PipelineLabelKey, "test-pipeline-run-cancelled"), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, "test-pipeline"), tb.TaskRunSpec(tb.TaskRunTaskRef("hello-world"), tb.TaskRunServiceAccountName("test-sa"), ), @@ -1540,8 +1540,8 @@ func TestReconcileOnCancelledPipelineRun(t *testing.T) { tb.TaskRun("test-pipeline-run-cancelled-hello-world", tb.TaskRunNamespace("foo"), tb.TaskRunOwnerReference("kind", "name"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, "test-pipeline-run-cancelled"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, "test-pipeline"), + tb.TaskRunLabel(pipeline.PipelineLabelKey, "test-pipeline-run-cancelled"), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, "test-pipeline"), tb.TaskRunSpec(tb.TaskRunTaskRef("hello-world"), tb.TaskRunServiceAccountName("test-sa"), ), @@ -1599,9 +1599,9 @@ func TestReconcileForCustomTaskWithPipelineTaskTimedOut(t *testing.T) { Name: prName, }}, Labels: map[string]string{ - pipeline.GroupName + pipeline.PipelineLabelKey: "test-pipeline", - pipeline.GroupName + pipeline.PipelineRunLabelKey: prName, - pipeline.GroupName + pipeline.PipelineTaskLabelKey: "hello-world-1", + pipeline.PipelineLabelKey: "test-pipeline", + pipeline.PipelineRunLabelKey: prName, + pipeline.PipelineTaskLabelKey: "hello-world-1", }, Annotations: map[string]string{}, }, @@ -1936,8 +1936,8 @@ func TestReconcileOnCancelledRunFinallyPipelineRunWithRunningFinalTask(t *testin tb.TaskRun("test-pipeline-run-cancelled-run-finally-hello-world", tb.TaskRunNamespace("foo"), tb.TaskRunOwnerReference("kind", "name"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, "test-pipeline-run-cancelled-run-finally"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, "test-pipeline"), + tb.TaskRunLabel(pipeline.PipelineLabelKey, "test-pipeline-run-cancelled-run-finally"), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, "test-pipeline"), tb.TaskRunSpec(tb.TaskRunTaskRef("hello-world"), tb.TaskRunServiceAccountName("test-sa"), ), @@ -1952,8 +1952,8 @@ func TestReconcileOnCancelledRunFinallyPipelineRunWithRunningFinalTask(t *testin tb.TaskRun("test-pipeline-run-cancelled-run-finally-final-task", tb.TaskRunNamespace("foo"), tb.TaskRunOwnerReference("kind", "name"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, "test-pipeline-run-cancelled-run-finally"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, "test-pipeline"), + tb.TaskRunLabel(pipeline.PipelineLabelKey, "test-pipeline-run-cancelled-run-finally"), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, "test-pipeline"), tb.TaskRunSpec(tb.TaskRunTaskRef("some-task"), tb.TaskRunServiceAccountName("test-sa"), ), @@ -2040,8 +2040,8 @@ func TestReconcileOnCancelledRunFinallyPipelineRunWithFinalTaskAndRetries(t *tes tb.TaskRun("test-pipeline-run-cancelled-run-finally-hello-world", tb.TaskRunNamespace("foo"), tb.TaskRunOwnerReference("kind", "name"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, "test-pipeline-run-cancelled-run-finally"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, "test-pipeline"), + tb.TaskRunLabel(pipeline.PipelineLabelKey, "test-pipeline-run-cancelled-run-finally"), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, "test-pipeline"), tb.TaskRunSpec(tb.TaskRunTaskRef("hello-world"), tb.TaskRunServiceAccountName("test-sa"), ), @@ -2668,10 +2668,10 @@ func TestReconcilePropagateLabels(t *testing.T) { tb.Controller, tb.BlockOwnerDeletion, ), tb.TaskRunLabel("tekton.dev/pipeline", "test-pipeline"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineTaskLabelKey, "hello-world-1"), + tb.TaskRunLabel(pipeline.PipelineTaskLabelKey, "hello-world-1"), tb.TaskRunLabel("tekton.dev/pipelineRun", "test-pipeline-run-with-labels"), tb.TaskRunLabel("PipelineRunLabel", "PipelineRunValue"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), tb.TaskRunSpec( tb.TaskRunTaskRef("hello-world"), tb.TaskRunServiceAccountName("test-sa"), @@ -2742,7 +2742,7 @@ func TestReconcileWithDifferentServiceAccounts(t *testing.T) { tb.TaskRunLabel("tekton.dev/pipeline", "test-pipeline"), tb.TaskRunLabel("tekton.dev/pipelineRun", "test-pipeline-run-different-service-accs"), tb.TaskRunLabel("tekton.dev/pipelineTask", "hello-world-0"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), ), tb.TaskRun(taskRunNames[1], tb.TaskRunNamespace("foo"), @@ -2757,7 +2757,7 @@ func TestReconcileWithDifferentServiceAccounts(t *testing.T) { tb.TaskRunLabel("tekton.dev/pipeline", "test-pipeline"), tb.TaskRunLabel("tekton.dev/pipelineRun", "test-pipeline-run-different-service-accs"), tb.TaskRunLabel("tekton.dev/pipelineTask", "hello-world-1"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), ), } for i := range ps[0].Spec.Tasks { @@ -2953,9 +2953,9 @@ func TestReconcilePropagateAnnotations(t *testing.T) { tb.Controller, tb.BlockOwnerDeletion, ), tb.TaskRunLabel("tekton.dev/pipeline", "test-pipeline"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineTaskLabelKey, "hello-world-1"), + tb.TaskRunLabel(pipeline.PipelineTaskLabelKey, "hello-world-1"), tb.TaskRunLabel("tekton.dev/pipelineRun", "test-pipeline-run-with-annotations"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), tb.TaskRunAnnotation("PipelineRunAnnotation", "PipelineRunValue"), tb.TaskRunSpec( tb.TaskRunTaskRef("hello-world"), @@ -3216,10 +3216,10 @@ func TestReconcileAndPropagateCustomPipelineTaskRunSpec(t *testing.T) { tb.OwnerReferenceAPIVersion("tekton.dev/v1beta1"), tb.Controller, tb.BlockOwnerDeletion, ), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, "test-pipeline"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineTaskLabelKey, "hello-world-1"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, "test-pipeline-run"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), + tb.TaskRunLabel(pipeline.PipelineLabelKey, "test-pipeline"), + tb.TaskRunLabel(pipeline.PipelineTaskLabelKey, "hello-world-1"), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, "test-pipeline-run"), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), tb.TaskRunAnnotation("PipelineRunAnnotation", "PipelineRunValue"), tb.TaskRunSpec( tb.TaskRunTaskRef("hello-world"), @@ -3428,9 +3428,9 @@ func TestReconcileWithFailingConditionChecks(t *testing.T) { tb.TaskRun(pipelineRunName+"task-1", tb.TaskRunNamespace("foo"), tb.TaskRunOwnerReference("kind", "name"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, "test-pipeline-run-with-conditions"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, "test-pipeline"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), + tb.TaskRunLabel(pipeline.PipelineLabelKey, "test-pipeline-run-with-conditions"), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, "test-pipeline"), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), tb.TaskRunSpec(tb.TaskRunTaskRef("hello-world")), tb.TaskRunStatus(tb.StatusCondition(apis.Condition{ Type: apis.ConditionSucceeded, @@ -3441,10 +3441,10 @@ func TestReconcileWithFailingConditionChecks(t *testing.T) { tb.TaskRun(conditionCheckName, tb.TaskRunNamespace("foo"), tb.TaskRunOwnerReference("kind", "name"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, "test-pipeline-run-with-conditions"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, "test-pipeline"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.ConditionCheckKey, conditionCheckName), - tb.TaskRunLabel(pipeline.GroupName+pipeline.ConditionNameKey, "always-false"), + tb.TaskRunLabel(pipeline.PipelineLabelKey, "test-pipeline-run-with-conditions"), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, "test-pipeline"), + tb.TaskRunLabel(pipeline.ConditionCheckKey, conditionCheckName), + tb.TaskRunLabel(pipeline.ConditionNameKey, "always-false"), tb.TaskRunSpec(tb.TaskRunTaskSpec()), tb.TaskRunStatus(tb.StatusCondition(apis.Condition{ Type: apis.ConditionSucceeded, @@ -3483,10 +3483,10 @@ func TestReconcileWithFailingConditionChecks(t *testing.T) { tb.OwnerReferenceAPIVersion("tekton.dev/v1beta1"), tb.Controller, tb.BlockOwnerDeletion, ), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, "test-pipeline"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineTaskLabelKey, "task-3"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, "test-pipeline-run-with-conditions"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), + tb.TaskRunLabel(pipeline.PipelineLabelKey, "test-pipeline"), + tb.TaskRunLabel(pipeline.PipelineTaskLabelKey, "task-3"), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, "test-pipeline-run-with-conditions"), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), tb.TaskRunAnnotation("PipelineRunAnnotation", "PipelineRunValue"), tb.TaskRunSpec( tb.TaskRunTaskRef("hello-world"), @@ -3506,12 +3506,12 @@ func makeExpectedTr(condName, ccName string, labels, annotations map[string]stri tb.OwnerReferenceAPIVersion("tekton.dev/v1beta1"), tb.Controller, tb.BlockOwnerDeletion, ), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, "test-pipeline"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineTaskLabelKey, "hello-world-1"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, "test-pipeline-run"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), - tb.TaskRunLabel(pipeline.GroupName+pipeline.ConditionCheckKey, ccName), - tb.TaskRunLabel(pipeline.GroupName+pipeline.ConditionNameKey, condName), + tb.TaskRunLabel(pipeline.PipelineLabelKey, "test-pipeline"), + tb.TaskRunLabel(pipeline.PipelineTaskLabelKey, "hello-world-1"), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, "test-pipeline-run"), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), + tb.TaskRunLabel(pipeline.ConditionCheckKey, ccName), + tb.TaskRunLabel(pipeline.ConditionNameKey, condName), tb.TaskRunLabels(labels), tb.TaskRunAnnotation("PipelineRunAnnotation", "PipelineRunValue"), tb.TaskRunAnnotations(annotations), @@ -3596,10 +3596,10 @@ func TestReconcileWithWhenExpressionsWithParameters(t *testing.T) { tb.OwnerReferenceAPIVersion("tekton.dev/v1beta1"), tb.Controller, tb.BlockOwnerDeletion, ), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, "test-pipeline"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineTaskLabelKey, "hello-world-1"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, "test-pipeline-run"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), + tb.TaskRunLabel(pipeline.PipelineLabelKey, "test-pipeline"), + tb.TaskRunLabel(pipeline.PipelineTaskLabelKey, "hello-world-1"), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, "test-pipeline-run"), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), tb.TaskRunAnnotation("PipelineRunAnnotation", "PipelineRunValue"), tb.TaskRunSpec( tb.TaskRunTaskRef("hello-world-1"), @@ -3729,7 +3729,7 @@ func TestReconcileWithWhenExpressionsWithTaskResults(t *testing.T) { tb.TaskRunLabel("tekton.dev/pipeline", "test-pipeline"), tb.TaskRunLabel("tekton.dev/pipelineRun", "test-pipeline-run-different-service-accs"), tb.TaskRunLabel("tekton.dev/pipelineTask", "b-task"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), tb.TaskRunSpec( tb.TaskRunTaskRef("b-task"), tb.TaskRunServiceAccountName("test-sa-0"), @@ -4437,7 +4437,7 @@ func TestReconcileWithTaskResults(t *testing.T) { tb.TaskRunLabel("tekton.dev/pipeline", "test-pipeline"), tb.TaskRunLabel("tekton.dev/pipelineRun", "test-pipeline-run-different-service-accs"), tb.TaskRunLabel("tekton.dev/pipelineTask", "b-task"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), tb.TaskRunSpec( tb.TaskRunTaskRef("b-task"), tb.TaskRunServiceAccountName("test-sa-0"), @@ -4514,7 +4514,7 @@ func TestReconcileWithTaskResultsEmbeddedNoneStarted(t *testing.T) { tb.TaskRunLabel("tekton.dev/pipeline", "test-pipeline-run-different-service-accs"), tb.TaskRunLabel("tekton.dev/pipelineRun", "test-pipeline-run-different-service-accs"), tb.TaskRunLabel("tekton.dev/pipelineTask", "a-task"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), tb.TaskRunSpec( tb.TaskRunTaskRef("a-task", tb.TaskRefKind(v1beta1.NamespacedTaskKind)), tb.TaskRunServiceAccountName("test-sa-0"), @@ -4694,9 +4694,9 @@ func TestReconcileOutOfSyncPipelineRun(t *testing.T) { taskRunDone := tb.TaskRun("test-pipeline-run-out-of-sync-hello-world-1", tb.TaskRunNamespace("foo"), tb.TaskRunOwnerReference("PipelineRun", prOutOfSyncName), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, testPipeline.Name), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, prOutOfSyncName), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineTaskLabelKey, "hello-world-1"), + tb.TaskRunLabel(pipeline.PipelineLabelKey, testPipeline.Name), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, prOutOfSyncName), + tb.TaskRunLabel(pipeline.PipelineTaskLabelKey, "hello-world-1"), tb.TaskRunSpec(tb.TaskRunTaskRef("hello-world")), tb.TaskRunStatus( tb.StatusCondition(apis.Condition{ @@ -4710,9 +4710,9 @@ func TestReconcileOutOfSyncPipelineRun(t *testing.T) { taskRunOrphaned := tb.TaskRun("test-pipeline-run-out-of-sync-hello-world-2", tb.TaskRunNamespace("foo"), tb.TaskRunOwnerReference("PipelineRun", prOutOfSyncName), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, testPipeline.Name), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, prOutOfSyncName), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineTaskLabelKey, "hello-world-2"), + tb.TaskRunLabel(pipeline.PipelineLabelKey, testPipeline.Name), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, prOutOfSyncName), + tb.TaskRunLabel(pipeline.PipelineTaskLabelKey, "hello-world-2"), tb.TaskRunSpec(tb.TaskRunTaskRef("hello-world")), tb.TaskRunStatus( tb.StatusCondition(apis.Condition{ @@ -4727,9 +4727,9 @@ func TestReconcileOutOfSyncPipelineRun(t *testing.T) { taskRunWithCondition := tb.TaskRun("test-pipeline-run-out-of-sync-hello-world-3", tb.TaskRunNamespace("foo"), tb.TaskRunOwnerReference("PipelineRun", prOutOfSyncName), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, testPipeline.Name), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, prOutOfSyncName), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineTaskLabelKey, "hello-world-3"), + tb.TaskRunLabel(pipeline.PipelineLabelKey, testPipeline.Name), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, prOutOfSyncName), + tb.TaskRunLabel(pipeline.PipelineTaskLabelKey, "hello-world-3"), tb.TaskRunSpec(tb.TaskRunTaskRef("hello-world")), tb.TaskRunStatus( tb.StatusCondition(apis.Condition{ @@ -4742,11 +4742,11 @@ func TestReconcileOutOfSyncPipelineRun(t *testing.T) { taskRunForConditionOfOrphanedTaskRun := tb.TaskRun(conditionCheckName3, tb.TaskRunNamespace("foo"), tb.TaskRunOwnerReference("PipelineRun", prOutOfSyncName), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, testPipeline.Name), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, prOutOfSyncName), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineTaskLabelKey, "hello-world-3"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.ConditionCheckKey, conditionCheckName3), - tb.TaskRunLabel(pipeline.GroupName+pipeline.ConditionNameKey, "always-true"), + tb.TaskRunLabel(pipeline.PipelineLabelKey, testPipeline.Name), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, prOutOfSyncName), + tb.TaskRunLabel(pipeline.PipelineTaskLabelKey, "hello-world-3"), + tb.TaskRunLabel(pipeline.ConditionCheckKey, conditionCheckName3), + tb.TaskRunLabel(pipeline.ConditionNameKey, "always-true"), tb.TaskRunSpec(tb.TaskRunTaskRef("always-true-0")), tb.TaskRunStatus( tb.StatusCondition(apis.Condition{ @@ -4763,11 +4763,11 @@ func TestReconcileOutOfSyncPipelineRun(t *testing.T) { taskRunForOrphanedCondition := tb.TaskRun(conditionCheckName4, tb.TaskRunNamespace("foo"), tb.TaskRunOwnerReference("PipelineRun", prOutOfSyncName), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, testPipeline.Name), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, prOutOfSyncName), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineTaskLabelKey, "hello-world-4"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.ConditionCheckKey, conditionCheckName4), - tb.TaskRunLabel(pipeline.GroupName+pipeline.ConditionNameKey, "always-true"), + tb.TaskRunLabel(pipeline.PipelineLabelKey, testPipeline.Name), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, prOutOfSyncName), + tb.TaskRunLabel(pipeline.PipelineTaskLabelKey, "hello-world-4"), + tb.TaskRunLabel(pipeline.ConditionCheckKey, conditionCheckName4), + tb.TaskRunLabel(pipeline.ConditionNameKey, "always-true"), tb.TaskRunSpec(tb.TaskRunTaskRef("always-true-0")), tb.TaskRunStatus( tb.StatusCondition(apis.Condition{ @@ -4786,9 +4786,9 @@ func TestReconcileOutOfSyncPipelineRun(t *testing.T) { Name: prOutOfSyncName, }}, Labels: map[string]string{ - pipeline.GroupName + pipeline.PipelineLabelKey: testPipeline.Name, - pipeline.GroupName + pipeline.PipelineRunLabelKey: prOutOfSyncName, - pipeline.GroupName + pipeline.PipelineTaskLabelKey: "hello-world-5", + pipeline.PipelineLabelKey: testPipeline.Name, + pipeline.PipelineRunLabelKey: prOutOfSyncName, + pipeline.PipelineTaskLabelKey: "hello-world-5", }, Annotations: map[string]string{}, }, @@ -5228,7 +5228,7 @@ func TestUpdatePipelineRunStatusFromTaskRuns(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "pr-task-1-xxyyy", Labels: map[string]string{ - pipeline.GroupName + pipeline.PipelineTaskLabelKey: "task-1", + pipeline.PipelineTaskLabelKey: "task-1", }, OwnerReferences: []metav1.OwnerReference{{UID: prUID}}, }, @@ -5237,9 +5237,9 @@ func TestUpdatePipelineRunStatusFromTaskRuns(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "pr-task-2-running-condition-check-xxyyy", Labels: map[string]string{ - pipeline.GroupName + pipeline.PipelineTaskLabelKey: "task-2", - pipeline.GroupName + pipeline.ConditionCheckKey: "pr-task-2-running-condition-check-xxyyy", - pipeline.GroupName + pipeline.ConditionNameKey: "running-condition", + pipeline.PipelineTaskLabelKey: "task-2", + pipeline.ConditionCheckKey: "pr-task-2-running-condition-check-xxyyy", + pipeline.ConditionNameKey: "running-condition", }, OwnerReferences: []metav1.OwnerReference{{UID: prUID}}, }, @@ -5248,7 +5248,7 @@ func TestUpdatePipelineRunStatusFromTaskRuns(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "pr-task-3-xxyyy", Labels: map[string]string{ - pipeline.GroupName + pipeline.PipelineTaskLabelKey: "task-3", + pipeline.PipelineTaskLabelKey: "task-3", }, OwnerReferences: []metav1.OwnerReference{{UID: prUID}}, }, @@ -5257,9 +5257,9 @@ func TestUpdatePipelineRunStatusFromTaskRuns(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "pr-task-3-successful-condition-check-xxyyy", Labels: map[string]string{ - pipeline.GroupName + pipeline.PipelineTaskLabelKey: "task-3", - pipeline.GroupName + pipeline.ConditionCheckKey: "pr-task-3-successful-condition-check-xxyyy", - pipeline.GroupName + pipeline.ConditionNameKey: "successful-condition", + pipeline.PipelineTaskLabelKey: "task-3", + pipeline.ConditionCheckKey: "pr-task-3-successful-condition-check-xxyyy", + pipeline.ConditionNameKey: "successful-condition", }, OwnerReferences: []metav1.OwnerReference{{UID: prUID}}, }, @@ -5268,9 +5268,9 @@ func TestUpdatePipelineRunStatusFromTaskRuns(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "pr-task-4-failed-condition-check-xxyyy", Labels: map[string]string{ - pipeline.GroupName + pipeline.PipelineTaskLabelKey: "task-4", - pipeline.GroupName + pipeline.ConditionCheckKey: "pr-task-4-failed-condition-check-xxyyy", - pipeline.GroupName + pipeline.ConditionNameKey: "failed-condition", + pipeline.PipelineTaskLabelKey: "task-4", + pipeline.ConditionCheckKey: "pr-task-4-failed-condition-check-xxyyy", + pipeline.ConditionNameKey: "failed-condition", }, OwnerReferences: []metav1.OwnerReference{{UID: prUID}}, }, @@ -5282,7 +5282,7 @@ func TestUpdatePipelineRunStatusFromTaskRuns(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "pr-task-1-xxyyy", Labels: map[string]string{ - pipeline.GroupName + pipeline.PipelineTaskLabelKey: "task-1", + pipeline.PipelineTaskLabelKey: "task-1", }, OwnerReferences: []metav1.OwnerReference{{UID: otherPrUID}}, }, @@ -5313,7 +5313,7 @@ func TestUpdatePipelineRunStatusFromTaskRuns(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "pr-task-1-xxyyy", Labels: map[string]string{ - pipeline.GroupName + pipeline.PipelineTaskLabelKey: "task-1", + pipeline.PipelineTaskLabelKey: "task-1", }, OwnerReferences: []metav1.OwnerReference{{UID: prUID}}, }, @@ -5328,7 +5328,7 @@ func TestUpdatePipelineRunStatusFromTaskRuns(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "pr-task-3-xxyyy", Labels: map[string]string{ - pipeline.GroupName + pipeline.PipelineTaskLabelKey: "task-3", + pipeline.PipelineTaskLabelKey: "task-3", }, OwnerReferences: []metav1.OwnerReference{{UID: prUID}}, }, @@ -5337,9 +5337,9 @@ func TestUpdatePipelineRunStatusFromTaskRuns(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "pr-task-3-successful-condition-check-xxyyy", Labels: map[string]string{ - pipeline.GroupName + pipeline.PipelineTaskLabelKey: "task-3", - pipeline.GroupName + pipeline.ConditionCheckKey: "pr-task-3-successful-condition-check-xxyyy", - pipeline.GroupName + pipeline.ConditionNameKey: "successful-condition", + pipeline.PipelineTaskLabelKey: "task-3", + pipeline.ConditionCheckKey: "pr-task-3-successful-condition-check-xxyyy", + pipeline.ConditionNameKey: "successful-condition", }, OwnerReferences: []metav1.OwnerReference{{UID: prUID}}, }, @@ -5792,9 +5792,9 @@ func getTaskRun(tr, pr, p, t string, status corev1.ConditionStatus) *v1beta1.Tas return tb.TaskRun(tr, tb.TaskRunNamespace("foo"), tb.TaskRunOwnerReference("pipelineRun", pr), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, p), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, pr), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineTaskLabelKey, t), + tb.TaskRunLabel(pipeline.PipelineLabelKey, p), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, pr), + tb.TaskRunLabel(pipeline.PipelineTaskLabelKey, t), tb.TaskRunSpec(tb.TaskRunTaskRef(t)), tb.TaskRunStatus( tb.StatusCondition(apis.Condition{ @@ -6052,7 +6052,7 @@ func TestReconciler_ReconcileKind_PipelineTaskContext(t *testing.T) { tb.TaskRunLabel("tekton.dev/pipeline", pipelineName), tb.TaskRunLabel("tekton.dev/pipelineRun", pipelineRunName), tb.TaskRunLabel("tekton.dev/pipelineTask", "finaltask"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineFinallyTasks), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineFinallyTasks), tb.TaskRunSpec( tb.TaskRunTaskRef("finaltask"), tb.TaskRunServiceAccountName("test-sa"), @@ -6283,10 +6283,10 @@ func TestReconcileWithTaskResultsInFinalTasks(t *testing.T) { BlockOwnerDeletion: &trueb, }}, Labels: map[string]string{ - "tekton.dev/pipeline": "test-pipeline", - "tekton.dev/pipelineRun": "test-pipeline-run-final-task-results", - "tekton.dev/pipelineTask": "final-task-1", - pipeline.GroupName + pipeline.MemberOfLabelKey: v1beta1.PipelineFinallyTasks, + "tekton.dev/pipeline": "test-pipeline", + "tekton.dev/pipelineRun": "test-pipeline-run-final-task-results", + "tekton.dev/pipelineTask": "final-task-1", + pipeline.MemberOfLabelKey: v1beta1.PipelineFinallyTasks, }, Annotations: map[string]string{}, }, @@ -6470,10 +6470,10 @@ func TestReconcile_RemotePipelineRef(t *testing.T) { Namespace: "foo", Annotations: map[string]string{}, Labels: map[string]string{ - "tekton.dev/pipeline": "test-pipeline", - "tekton.dev/pipelineRun": "test-pipeline-run-success", - pipeline.GroupName + pipeline.PipelineTaskLabelKey: "unit-test-1", - pipeline.GroupName + pipeline.MemberOfLabelKey: v1beta1.PipelineTasks, + "tekton.dev/pipeline": "test-pipeline", + "tekton.dev/pipelineRun": "test-pipeline-run-success", + pipeline.PipelineTaskLabelKey: "unit-test-1", + pipeline.MemberOfLabelKey: v1beta1.PipelineTasks, }, OwnerReferences: []metav1.OwnerReference{{ APIVersion: "tekton.dev/v1beta1", @@ -6578,10 +6578,10 @@ func TestReconcile_OptionalWorkspacesOmitted(t *testing.T) { Namespace: "foo", Annotations: map[string]string{}, Labels: map[string]string{ - "tekton.dev/pipeline": "test-pipeline-run-success", - "tekton.dev/pipelineRun": "test-pipeline-run-success", - pipeline.GroupName + pipeline.PipelineTaskLabelKey: "unit-test-1", - pipeline.GroupName + pipeline.MemberOfLabelKey: v1beta1.PipelineTasks, + "tekton.dev/pipeline": "test-pipeline-run-success", + "tekton.dev/pipelineRun": "test-pipeline-run-success", + pipeline.PipelineTaskLabelKey: "unit-test-1", + pipeline.MemberOfLabelKey: v1beta1.PipelineTasks, }, OwnerReferences: []metav1.OwnerReference{{ APIVersion: "tekton.dev/v1beta1", @@ -6782,10 +6782,10 @@ func getTaskRunWithTaskSpec(tr, pr, p, t string, labels, annotations map[string] tb.TaskRunOwnerReference("PipelineRun", pr, tb.OwnerReferenceAPIVersion("tekton.dev/v1beta1"), tb.Controller, tb.BlockOwnerDeletion), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, p), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, pr), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineTaskLabelKey, t), - tb.TaskRunLabel(pipeline.GroupName+pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), + tb.TaskRunLabel(pipeline.PipelineLabelKey, p), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, pr), + tb.TaskRunLabel(pipeline.PipelineTaskLabelKey, t), + tb.TaskRunLabel(pipeline.MemberOfLabelKey, v1beta1.PipelineTasks), tb.TaskRunLabels(labels), tb.TaskRunAnnotations(annotations), tb.TaskRunSpec(tb.TaskRunTaskSpec(tb.Step("myimage", tb.StepName("mystep"))), diff --git a/pkg/reconciler/taskrun/metrics_test.go b/pkg/reconciler/taskrun/metrics_test.go index 292c9a4aa42..d9b1b30a03a 100644 --- a/pkg/reconciler/taskrun/metrics_test.go +++ b/pkg/reconciler/taskrun/metrics_test.go @@ -135,8 +135,8 @@ func TestRecordTaskRunDurationCount(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "taskrun-1", Namespace: "ns", Labels: map[string]string{ - pipeline.GroupName + pipeline.PipelineLabelKey: "pipeline-1", - pipeline.GroupName + pipeline.PipelineRunLabelKey: "pipelinerun-1", + pipeline.PipelineLabelKey: "pipeline-1", + pipeline.PipelineRunLabelKey: "pipelinerun-1", }, }, Spec: v1beta1.TaskRunSpec{ @@ -175,8 +175,8 @@ func TestRecordTaskRunDurationCount(t *testing.T) { ObjectMeta: metav1.ObjectMeta{ Name: "taskrun-1", Namespace: "ns", Labels: map[string]string{ - pipeline.GroupName + pipeline.PipelineLabelKey: "pipeline-1", - pipeline.GroupName + pipeline.PipelineRunLabelKey: "pipelinerun-1", + pipeline.PipelineLabelKey: "pipeline-1", + pipeline.PipelineRunLabelKey: "pipelinerun-1", }, }, Spec: v1beta1.TaskRunSpec{ @@ -347,8 +347,8 @@ func TestRecordCloudEvents(t *testing.T) { name: "for succeeded task", taskRun: tb.TaskRun("taskrun-1", tb.TaskRunNamespace("ns"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, "pipeline-1"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, "pipelinerun-1"), + tb.TaskRunLabel(pipeline.PipelineLabelKey, "pipeline-1"), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, "pipelinerun-1"), tb.TaskRunSpec( tb.TaskRunTaskRef("task-1"), ), @@ -379,8 +379,8 @@ func TestRecordCloudEvents(t *testing.T) { name: "for failed task", taskRun: tb.TaskRun("taskrun-1", tb.TaskRunNamespace("ns"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineLabelKey, "pipeline-1"), - tb.TaskRunLabel(pipeline.GroupName+pipeline.PipelineRunLabelKey, "pipelinerun-1"), + tb.TaskRunLabel(pipeline.PipelineLabelKey, "pipeline-1"), + tb.TaskRunLabel(pipeline.PipelineRunLabelKey, "pipelinerun-1"), tb.TaskRunSpec( tb.TaskRunTaskRef("task-1"), ), diff --git a/pkg/reconciler/taskrun/resources/input_resources.go b/pkg/reconciler/taskrun/resources/input_resources.go index 0ba8e501cad..24edfe14769 100644 --- a/pkg/reconciler/taskrun/resources/input_resources.go +++ b/pkg/reconciler/taskrun/resources/input_resources.go @@ -62,7 +62,7 @@ func AddInputResource( mountPVC := false mountSecrets := false - prNameFromLabel := taskRun.Labels[pipeline.GroupName+pipeline.PipelineRunLabelKey] + prNameFromLabel := taskRun.Labels[pipeline.PipelineRunLabelKey] if prNameFromLabel == "" { prNameFromLabel = pvcName } diff --git a/pkg/reconciler/taskrun/taskrun.go b/pkg/reconciler/taskrun/taskrun.go index f08a7d2a8d1..0b1fa5ff8bb 100644 --- a/pkg/reconciler/taskrun/taskrun.go +++ b/pkg/reconciler/taskrun/taskrun.go @@ -302,9 +302,9 @@ func (c *Reconciler) prepare(ctx context.Context, tr *v1beta1.TaskRun) (*v1beta1 } if tr.Spec.TaskRef != nil { if tr.Spec.TaskRef.Kind == "ClusterTask" { - tr.ObjectMeta.Labels[pipeline.GroupName+pipeline.ClusterTaskLabelKey] = taskMeta.Name + tr.ObjectMeta.Labels[pipeline.ClusterTaskLabelKey] = taskMeta.Name } else { - tr.ObjectMeta.Labels[pipeline.GroupName+pipeline.TaskLabelKey] = taskMeta.Name + tr.ObjectMeta.Labels[pipeline.TaskLabelKey] = taskMeta.Name } } @@ -401,7 +401,7 @@ func (c *Reconciler) reconcile(ctx context.Context, tr *v1beta1.TaskRun, rtr *re // List pods that have a label with this TaskRun name. Do not include other labels from the // TaskRun in this selector. The user could change them during the lifetime of the TaskRun so the // current labels may not be set on a previously created Pod. - labelSelector := fmt.Sprintf("%s=%s", podconvert.TaskRunLabelKey, tr.Name) + labelSelector := fmt.Sprintf("%s=%s", pipeline.TaskRunLabelKey, tr.Name) pos, err := c.KubeClientSet.CoreV1().Pods(tr.Namespace).List(ctx, metav1.ListOptions{ LabelSelector: labelSelector, }) diff --git a/pkg/reconciler/taskrun/taskrun_test.go b/pkg/reconciler/taskrun/taskrun_test.go index 2f4d4d1b8d9..9ca54e91424 100644 --- a/pkg/reconciler/taskrun/taskrun_test.go +++ b/pkg/reconciler/taskrun/taskrun_test.go @@ -70,12 +70,9 @@ import ( ) const ( - entrypointLocation = "/tekton/tools/entrypoint" - taskNameLabelKey = pipeline.GroupName + pipeline.TaskLabelKey - clusterTaskNameLabelKey = pipeline.GroupName + pipeline.ClusterTaskLabelKey - taskRunNameLabelKey = pipeline.GroupName + pipeline.TaskRunLabelKey - workspaceDir = "/workspace" - currentAPIVersion = "tekton.dev/v1beta1" + entrypointLocation = "/tekton/tools/entrypoint" + workspaceDir = "/workspace" + currentAPIVersion = "tekton.dev/v1beta1" ) var ( @@ -465,8 +462,8 @@ func TestReconcile_ExplicitDefaultSA(t *testing.T) { wantPod: tb.Pod("test-taskrun-run-success-pod-abcde", tb.PodNamespace("foo"), tb.PodAnnotation(podconvert.ReleaseAnnotation, fakeVersion), - tb.PodLabel(taskNameLabelKey, "test-task"), - tb.PodLabel(taskRunNameLabelKey, "test-taskrun-run-success"), + tb.PodLabel(pipeline.TaskLabelKey, "test-task"), + tb.PodLabel(pipeline.TaskRunLabelKey, "test-taskrun-run-success"), tb.PodLabel("app.kubernetes.io/managed-by", "tekton-pipelines"), tb.PodOwnerReference("TaskRun", "test-taskrun-run-success", tb.OwnerReferenceAPIVersion(currentAPIVersion)), @@ -512,8 +509,8 @@ func TestReconcile_ExplicitDefaultSA(t *testing.T) { wantPod: tb.Pod("test-taskrun-with-sa-run-success-pod-abcde", tb.PodNamespace("foo"), tb.PodAnnotation(podconvert.ReleaseAnnotation, fakeVersion), - tb.PodLabel(taskNameLabelKey, "test-with-sa"), - tb.PodLabel(taskRunNameLabelKey, "test-taskrun-with-sa-run-success"), + tb.PodLabel(pipeline.TaskLabelKey, "test-with-sa"), + tb.PodLabel(pipeline.TaskRunLabelKey, "test-taskrun-with-sa-run-success"), tb.PodLabel("app.kubernetes.io/managed-by", "tekton-pipelines"), tb.PodOwnerReference("TaskRun", "test-taskrun-with-sa-run-success", tb.OwnerReferenceAPIVersion(currentAPIVersion)), @@ -647,8 +644,8 @@ func TestReconcile_FeatureFlags(t *testing.T) { wantPod: tb.Pod("test-taskrun-run-home-env-pod-abcde", tb.PodNamespace("foo"), tb.PodAnnotation(podconvert.ReleaseAnnotation, fakeVersion), - tb.PodLabel(taskNameLabelKey, "test-task-with-env-var"), - tb.PodLabel(taskRunNameLabelKey, "test-taskrun-run-home-env"), + tb.PodLabel(pipeline.TaskLabelKey, "test-task-with-env-var"), + tb.PodLabel(pipeline.TaskRunLabelKey, "test-taskrun-run-home-env"), tb.PodLabel("app.kubernetes.io/managed-by", "tekton-pipelines"), tb.PodOwnerReference("TaskRun", "test-taskrun-run-home-env", tb.OwnerReferenceAPIVersion(currentAPIVersion)), @@ -696,8 +693,8 @@ func TestReconcile_FeatureFlags(t *testing.T) { wantPod: tb.Pod("test-taskrun-run-working-dir-pod-abcde", tb.PodNamespace("foo"), tb.PodAnnotation(podconvert.ReleaseAnnotation, fakeVersion), - tb.PodLabel(taskNameLabelKey, "test-task"), - tb.PodLabel(taskRunNameLabelKey, "test-taskrun-run-working-dir"), + tb.PodLabel(pipeline.TaskLabelKey, "test-task"), + tb.PodLabel(pipeline.TaskRunLabelKey, "test-taskrun-run-working-dir"), tb.PodLabel("app.kubernetes.io/managed-by", "tekton-pipelines"), tb.PodOwnerReference("TaskRun", "test-taskrun-run-working-dir", tb.OwnerReferenceAPIVersion(currentAPIVersion)), @@ -970,7 +967,7 @@ func TestReconcile(t *testing.T) { taskRunWithLabels := tb.TaskRun("test-taskrun-with-labels", tb.TaskRunNamespace("foo"), tb.TaskRunLabel("TaskRunLabel", "TaskRunValue"), - tb.TaskRunLabel(taskRunNameLabelKey, "WillNotBeUsed"), + tb.TaskRunLabel(pipeline.TaskRunLabelKey, "WillNotBeUsed"), tb.TaskRunSpec( tb.TaskRunTaskRef(simpleTask.Name), ), @@ -1045,8 +1042,8 @@ func TestReconcile(t *testing.T) { wantPod: tb.Pod("test-taskrun-run-success-pod-abcde", tb.PodNamespace("foo"), tb.PodAnnotation(podconvert.ReleaseAnnotation, fakeVersion), - tb.PodLabel(taskNameLabelKey, "test-task"), - tb.PodLabel(taskRunNameLabelKey, "test-taskrun-run-success"), + tb.PodLabel(pipeline.TaskLabelKey, "test-task"), + tb.PodLabel(pipeline.TaskRunLabelKey, "test-taskrun-run-success"), tb.PodLabel("app.kubernetes.io/managed-by", "tekton-pipelines"), tb.PodOwnerReference("TaskRun", "test-taskrun-run-success", tb.OwnerReferenceAPIVersion(currentAPIVersion)), @@ -1096,8 +1093,8 @@ func TestReconcile(t *testing.T) { wantPod: tb.Pod("test-taskrun-with-sa-run-success-pod-abcde", tb.PodNamespace("foo"), tb.PodAnnotation(podconvert.ReleaseAnnotation, fakeVersion), - tb.PodLabel(taskNameLabelKey, "test-with-sa"), - tb.PodLabel(taskRunNameLabelKey, "test-taskrun-with-sa-run-success"), + tb.PodLabel(pipeline.TaskLabelKey, "test-with-sa"), + tb.PodLabel(pipeline.TaskRunLabelKey, "test-taskrun-with-sa-run-success"), tb.PodLabel("app.kubernetes.io/managed-by", "tekton-pipelines"), tb.PodOwnerReference("TaskRun", "test-taskrun-with-sa-run-success", tb.OwnerReferenceAPIVersion(currentAPIVersion)), @@ -1147,8 +1144,8 @@ func TestReconcile(t *testing.T) { wantPod: tb.Pod("test-taskrun-substitution-pod-abcde", tb.PodNamespace("foo"), tb.PodAnnotation(podconvert.ReleaseAnnotation, fakeVersion), - tb.PodLabel(taskNameLabelKey, "test-task-with-substitution"), - tb.PodLabel(taskRunNameLabelKey, "test-taskrun-substitution"), + tb.PodLabel(pipeline.TaskLabelKey, "test-task-with-substitution"), + tb.PodLabel(pipeline.TaskRunLabelKey, "test-taskrun-substitution"), tb.PodLabel("app.kubernetes.io/managed-by", "tekton-pipelines"), tb.PodOwnerReference("TaskRun", "test-taskrun-substitution", tb.OwnerReferenceAPIVersion(currentAPIVersion)), @@ -1331,7 +1328,7 @@ func TestReconcile(t *testing.T) { wantPod: tb.Pod("test-taskrun-with-taskspec-pod-abcde", tb.PodNamespace("foo"), tb.PodAnnotation(podconvert.ReleaseAnnotation, fakeVersion), - tb.PodLabel(taskRunNameLabelKey, "test-taskrun-with-taskspec"), + tb.PodLabel(pipeline.TaskRunLabelKey, "test-taskrun-with-taskspec"), tb.PodLabel("app.kubernetes.io/managed-by", "tekton-pipelines"), tb.PodOwnerReference("TaskRun", "test-taskrun-with-taskspec", tb.OwnerReferenceAPIVersion(currentAPIVersion)), @@ -1414,8 +1411,8 @@ func TestReconcile(t *testing.T) { wantPod: tb.Pod("test-taskrun-with-cluster-task-pod-abcde", tb.PodNamespace("foo"), tb.PodAnnotation(podconvert.ReleaseAnnotation, fakeVersion), - tb.PodLabel(clusterTaskNameLabelKey, "test-cluster-task"), - tb.PodLabel(taskRunNameLabelKey, "test-taskrun-with-cluster-task"), + tb.PodLabel(pipeline.ClusterTaskLabelKey, "test-cluster-task"), + tb.PodLabel(pipeline.TaskRunLabelKey, "test-taskrun-with-cluster-task"), tb.PodLabel("app.kubernetes.io/managed-by", "tekton-pipelines"), tb.PodOwnerReference("TaskRun", "test-taskrun-with-cluster-task", tb.OwnerReferenceAPIVersion(currentAPIVersion)), @@ -1465,7 +1462,7 @@ func TestReconcile(t *testing.T) { wantPod: tb.Pod("test-taskrun-with-resource-spec-pod-abcde", tb.PodNamespace("foo"), tb.PodAnnotation(podconvert.ReleaseAnnotation, fakeVersion), - tb.PodLabel(taskRunNameLabelKey, "test-taskrun-with-resource-spec"), + tb.PodLabel(pipeline.TaskRunLabelKey, "test-taskrun-with-resource-spec"), tb.PodLabel("app.kubernetes.io/managed-by", "tekton-pipelines"), tb.PodOwnerReference("TaskRun", "test-taskrun-with-resource-spec", tb.OwnerReferenceAPIVersion(currentAPIVersion)), @@ -1548,8 +1545,8 @@ func TestReconcile(t *testing.T) { wantPod: tb.Pod("test-taskrun-with-pod-pod-abcde", tb.PodNamespace("foo"), tb.PodAnnotation(podconvert.ReleaseAnnotation, fakeVersion), - tb.PodLabel(taskNameLabelKey, "test-task"), - tb.PodLabel(taskRunNameLabelKey, "test-taskrun-with-pod"), + tb.PodLabel(pipeline.TaskLabelKey, "test-task"), + tb.PodLabel(pipeline.TaskRunLabelKey, "test-taskrun-with-pod"), tb.PodLabel("app.kubernetes.io/managed-by", "tekton-pipelines"), tb.PodOwnerReference("TaskRun", "test-taskrun-with-pod", tb.OwnerReferenceAPIVersion(currentAPIVersion)), @@ -1598,7 +1595,7 @@ func TestReconcile(t *testing.T) { wantPod: tb.Pod("test-taskrun-with-credentials-variable-pod-9l9zj", tb.PodNamespace("foo"), tb.PodAnnotation(podconvert.ReleaseAnnotation, fakeVersion), - tb.PodLabel(taskRunNameLabelKey, "test-taskrun-with-credentials-variable"), + tb.PodLabel(pipeline.TaskRunLabelKey, "test-taskrun-with-credentials-variable"), tb.PodLabel("app.kubernetes.io/managed-by", "tekton-pipelines"), tb.PodOwnerReference("TaskRun", "test-taskrun-with-credentials-variable", tb.OwnerReferenceAPIVersion(currentAPIVersion)), @@ -1648,8 +1645,8 @@ func TestReconcile(t *testing.T) { wantPod: tb.Pod("test-taskrun-bundle-pod-abcde", tb.PodNamespace("foo"), tb.PodAnnotation(podconvert.ReleaseAnnotation, fakeVersion), - tb.PodLabel(taskNameLabelKey, "test-task"), - tb.PodLabel(taskRunNameLabelKey, "test-taskrun-bundle"), + tb.PodLabel(pipeline.TaskLabelKey, "test-task"), + tb.PodLabel(pipeline.TaskRunLabelKey, "test-taskrun-bundle"), tb.PodLabel("app.kubernetes.io/managed-by", "tekton-pipelines"), tb.PodOwnerReference("TaskRun", "test-taskrun-bundle", tb.OwnerReferenceAPIVersion(currentAPIVersion)), @@ -2052,7 +2049,7 @@ func TestReconcilePodUpdateStatus(t *testing.T) { t.Fatalf("Did not get expected condition %s", diff.PrintWantGot(d)) } - trLabel, ok := newTr.ObjectMeta.Labels[taskNameLabelKey] + trLabel, ok := newTr.ObjectMeta.Labels[pipeline.TaskLabelKey] if !ok { t.Errorf("Labels were not added to task run") } diff --git a/test/duplicate_test.go b/test/duplicate_test.go index 012ec29a74e..86a60e20202 100644 --- a/test/duplicate_test.go +++ b/test/duplicate_test.go @@ -73,7 +73,7 @@ func TestDuplicatePodTaskRun(t *testing.T) { } pods, err := c.KubeClient.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{ - LabelSelector: fmt.Sprintf("%s=%s", pipeline.GroupName+pipeline.TaskRunLabelKey, taskrunName), + LabelSelector: fmt.Sprintf("%s=%s", pipeline.TaskRunLabelKey, taskrunName), }) if err != nil { t.Errorf("Error getting TaskRun pod list: %v", err) diff --git a/test/pipelinerun_test.go b/test/pipelinerun_test.go index b2856c85343..fd6584ad69a 100644 --- a/test/pipelinerun_test.go +++ b/test/pipelinerun_test.go @@ -761,7 +761,7 @@ func checkLabelPropagation(ctx context.Context, t *testing.T, c *clients, namesp labels[key] = val } // This label is added to every PipelineRun by the PipelineRun controller - labels[pipeline.GroupName+pipeline.PipelineLabelKey] = p.Name + labels[pipeline.PipelineLabelKey] = p.Name assertLabelsMatch(t, labels, pr.ObjectMeta.Labels) // Check label propagation to TaskRuns. @@ -769,7 +769,7 @@ func checkLabelPropagation(ctx context.Context, t *testing.T, c *clients, namesp labels[key] = val } // This label is added to every TaskRun by the PipelineRun controller - labels[pipeline.GroupName+pipeline.PipelineRunLabelKey] = pr.Name + labels[pipeline.PipelineRunLabelKey] = pr.Name if tr.Spec.TaskRef != nil { task, err := c.TaskClient.Get(ctx, tr.Spec.TaskRef.Name, metav1.GetOptions{}) if err != nil { @@ -779,7 +779,7 @@ func checkLabelPropagation(ctx context.Context, t *testing.T, c *clients, namesp labels[key] = val } // This label is added to TaskRuns that reference a Task by the TaskRun controller - labels[pipeline.GroupName+pipeline.TaskLabelKey] = task.Name + labels[pipeline.TaskLabelKey] = task.Name } assertLabelsMatch(t, labels, tr.ObjectMeta.Labels) @@ -789,7 +789,7 @@ func checkLabelPropagation(ctx context.Context, t *testing.T, c *clients, namesp // Check label propagation to Pods. pod := getPodForTaskRun(ctx, t, c.KubeClient, namespace, tr) // This label is added to every Pod by the TaskRun controller - labels[pipeline.GroupName+pipeline.TaskRunLabelKey] = tr.Name + labels[pipeline.TaskRunLabelKey] = tr.Name assertLabelsMatch(t, labels, pod.ObjectMeta.Labels) } } @@ -836,7 +836,7 @@ func checkAnnotationPropagation(ctx context.Context, t *testing.T, c *clients, n func getPodForTaskRun(ctx context.Context, t *testing.T, kubeClient kubernetes.Interface, namespace string, tr *v1beta1.TaskRun) *corev1.Pod { // The Pod name has a random suffix, so we filter by label to find the one we care about. pods, err := kubeClient.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{ - LabelSelector: pipeline.GroupName + pipeline.TaskRunLabelKey + " = " + tr.Name, + LabelSelector: pipeline.TaskRunLabelKey + " = " + tr.Name, }) if err != nil { t.Fatalf("Couldn't get expected Pod for %s: %s", tr.Name, err) diff --git a/test/v1alpha1/duplicate_test.go b/test/v1alpha1/duplicate_test.go index 0e356a439fe..e69582a9401 100644 --- a/test/v1alpha1/duplicate_test.go +++ b/test/v1alpha1/duplicate_test.go @@ -66,7 +66,7 @@ func TestDuplicatePodTaskRun(t *testing.T) { } pods, err := c.KubeClient.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{ - LabelSelector: fmt.Sprintf("%s=%s", pipeline.GroupName+pipeline.TaskRunLabelKey, taskrunName), + LabelSelector: fmt.Sprintf("%s=%s", pipeline.TaskRunLabelKey, taskrunName), }) if err != nil { t.Errorf("Error getting TaskRun pod list: %v", err) diff --git a/test/v1alpha1/pipelinerun_test.go b/test/v1alpha1/pipelinerun_test.go index 156792af6cf..bb3d1eaf594 100644 --- a/test/v1alpha1/pipelinerun_test.go +++ b/test/v1alpha1/pipelinerun_test.go @@ -447,7 +447,7 @@ func checkLabelPropagation(ctx context.Context, t *testing.T, c *clients, namesp labels[key] = val } // This label is added to every PipelineRun by the PipelineRun controller - labels[pipeline.GroupName+pipeline.PipelineLabelKey] = p.Name + labels[pipeline.PipelineLabelKey] = p.Name assertLabelsMatch(t, labels, pr.ObjectMeta.Labels) // Check label propagation to TaskRuns. @@ -455,7 +455,7 @@ func checkLabelPropagation(ctx context.Context, t *testing.T, c *clients, namesp labels[key] = val } // This label is added to every TaskRun by the PipelineRun controller - labels[pipeline.GroupName+pipeline.PipelineRunLabelKey] = pr.Name + labels[pipeline.PipelineRunLabelKey] = pr.Name if tr.Spec.TaskRef != nil { task, err := c.TaskClient.Get(ctx, tr.Spec.TaskRef.Name, metav1.GetOptions{}) if err != nil { @@ -465,7 +465,7 @@ func checkLabelPropagation(ctx context.Context, t *testing.T, c *clients, namesp labels[key] = val } // This label is added to TaskRuns that reference a Task by the TaskRun controller - labels[pipeline.GroupName+pipeline.TaskLabelKey] = task.Name + labels[pipeline.TaskLabelKey] = task.Name } assertLabelsMatch(t, labels, tr.ObjectMeta.Labels) @@ -475,7 +475,7 @@ func checkLabelPropagation(ctx context.Context, t *testing.T, c *clients, namesp // Check label propagation to Pods. pod := getPodForTaskRun(ctx, t, c.KubeClient, namespace, tr) // This label is added to every Pod by the TaskRun controller - labels[pipeline.GroupName+pipeline.TaskRunLabelKey] = tr.Name + labels[pipeline.TaskRunLabelKey] = tr.Name assertLabelsMatch(t, labels, pod.ObjectMeta.Labels) } } @@ -522,7 +522,7 @@ func checkAnnotationPropagation(ctx context.Context, t *testing.T, c *clients, n func getPodForTaskRun(ctx context.Context, t *testing.T, kubeClient kubernetes.Interface, namespace string, tr *v1alpha1.TaskRun) *corev1.Pod { // The Pod name has a random suffix, so we filter by label to find the one we care about. pods, err := kubeClient.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{ - LabelSelector: pipeline.GroupName + pipeline.TaskRunLabelKey + " = " + tr.Name, + LabelSelector: pipeline.TaskRunLabelKey + " = " + tr.Name, }) if err != nil { t.Fatalf("Couldn't get expected Pod for %s: %s", tr.Name, err)