Skip to content

Commit b0c227f

Browse files
committed
Fix PipelineRunStatus Reconciler Updates and Tests for Minimal EmbeddedStatus Switch
This commit fixes the updates for reconciling PipelineRunStatus when switching the DefaultEmbeddedStatus from `Full` to `Minimal`. The prior runs or taskruns status would not have been reset before this change. The related emtpy runs and taskruns are removed because these fields will be `nil`.
1 parent c752a36 commit b0c227f

File tree

2 files changed

+5
-24
lines changed

2 files changed

+5
-24
lines changed

pkg/reconciler/pipelinerun/pipelinerun.go

+5
Original file line numberDiff line numberDiff line change
@@ -1334,6 +1334,11 @@ func updatePipelineRunStatusFromChildObjects(ctx context.Context, logger *zap.Su
13341334
fullEmbedded := cfg.FeatureFlags.EmbeddedStatus == config.FullEmbeddedStatus || cfg.FeatureFlags.EmbeddedStatus == config.BothEmbeddedStatus
13351335
minimalEmbedded := cfg.FeatureFlags.EmbeddedStatus == config.MinimalEmbeddedStatus || cfg.FeatureFlags.EmbeddedStatus == config.BothEmbeddedStatus
13361336

1337+
if cfg.FeatureFlags.EmbeddedStatus == config.MinimalEmbeddedStatus {
1338+
pr.Status.TaskRuns = nil
1339+
pr.Status.Runs = nil
1340+
}
1341+
13371342
if minimalEmbedded {
13381343
updatePipelineRunStatusFromChildRefs(logger, pr, taskRuns, runObjects)
13391344
}

pkg/reconciler/pipelinerun/pipelinerun_test.go

-24
Original file line numberDiff line numberDiff line change
@@ -5101,7 +5101,6 @@ spec:
51015101
pipelineRef:
51025102
name: test-pipeline
51035103
status:
5104-
runs: {}
51055104
pipelineSpec:
51065105
results:
51075106
- description: pipeline result
@@ -5135,7 +5134,6 @@ status:
51355134
value: aResultValue
51365135
- name: custom-result
51375136
value: bResultValue
5138-
taskRuns: {}
51395137
childReferences:
51405138
- apiVersion: tekton.dev/v1beta1
51415139
kind: TaskRun
@@ -5432,7 +5430,6 @@ spec:
54325430
pipelineRef:
54335431
name: test-pipeline
54345432
status:
5435-
runs: {}
54365433
pipelineSpec:
54375434
results:
54385435
- description: pipeline result
@@ -5461,7 +5458,6 @@ status:
54615458
value: aResultValue
54625459
- name: custom-result
54635460
value: bResultValue
5464-
taskRuns: {}
54655461
childReferences:
54665462
- apiVersion: tekton.dev/v1alpha1
54675463
kind: Run
@@ -8742,8 +8738,6 @@ status:
87428738
kind: TaskRun
87438739
name: pr-platforms-and-browsers-8
87448740
pipelineTaskName: platforms-and-browsers
8745-
taskRuns: {}
8746-
runs: {}
87478741
`),
87488742
}, {
87498743
name: "p-finally",
@@ -8899,8 +8893,6 @@ status:
88998893
kind: TaskRun
89008894
name: pr-platforms-and-browsers-8
89018895
pipelineTaskName: platforms-and-browsers
8902-
taskRuns: {}
8903-
runs: {}
89048896
`),
89058897
}}
89068898
for _, tt := range tests {
@@ -9339,8 +9331,6 @@ status:
93399331
kind: TaskRun
93409332
name: pr-platforms-and-browsers-8
93419333
pipelineTaskName: platforms-and-browsers
9342-
taskRuns: {}
9343-
runs: {}
93449334
`),
93459335
}, {
93469336
name: "p-finally",
@@ -9507,8 +9497,6 @@ status:
95079497
kind: TaskRun
95089498
name: pr-platforms-and-browsers-8
95099499
pipelineTaskName: platforms-and-browsers
9510-
taskRuns: {}
9511-
runs: {}
95129500
`),
95139501
}}
95149502
for _, tt := range tests {
@@ -9688,8 +9676,6 @@ status:
96889676
kind: TaskRun
96899677
name: pr-platforms-and-browsers-1
96909678
pipelineTaskName: platforms-and-browsers
9691-
taskRuns: {}
9692-
runs: {}
96939679
`),
96949680
},
96959681
expectedPipelineRun: parse.MustParseV1beta1PipelineRun(t, `
@@ -9734,8 +9720,6 @@ status:
97349720
kind: TaskRun
97359721
name: pr-platforms-and-browsers-1
97369722
pipelineTaskName: platforms-and-browsers
9737-
taskRuns: {}
9738-
runs: {}
97399723
`),
97409724
expectedTaskRuns: []*v1beta1.TaskRun{
97419725
mustParseTaskRunWithObjectMeta(t,
@@ -9882,8 +9866,6 @@ status:
98829866
kind: TaskRun
98839867
name: pr-platforms-and-browsers-1
98849868
pipelineTaskName: platforms-and-browsers
9885-
taskRuns: {}
9886-
runs: {}
98879869
`),
98889870
},
98899871
expectedPipelineRun: parse.MustParseV1beta1PipelineRun(t, `
@@ -9928,8 +9910,6 @@ status:
99289910
kind: TaskRun
99299911
name: pr-platforms-and-browsers-1
99309912
pipelineTaskName: platforms-and-browsers
9931-
taskRuns: {}
9932-
runs: {}
99339913
`),
99349914
expectedTaskRuns: []*v1beta1.TaskRun{
99359915
mustParseTaskRunWithObjectMeta(t,
@@ -10343,8 +10323,6 @@ status:
1034310323
kind: Run
1034410324
name: pr-platforms-and-browsers-8
1034510325
pipelineTaskName: platforms-and-browsers
10346-
taskRuns: {}
10347-
runs: {}
1034810326
`),
1034910327
}, {
1035010328
name: "p-finally",
@@ -10501,8 +10479,6 @@ status:
1050110479
kind: Run
1050210480
name: pr-platforms-and-browsers-8
1050310481
pipelineTaskName: platforms-and-browsers
10504-
taskRuns: {}
10505-
runs: {}
1050610482
`),
1050710483
}}
1050810484
for _, tt := range tests {

0 commit comments

Comments
 (0)