From fa2af13834b94b171ec6e83ae16dd6d58cc5fa13 Mon Sep 17 00:00:00 2001 From: Jerop Date: Tue, 7 Jun 2022 20:41:34 -0400 Subject: [PATCH] Remove `Conditions` from deprecations table `Conditions` were removed in https://github.com/tektoncd/pipeline/pull/4942. In this change, we remove the deprecation and removal notice for `Conditions` from the deprecations table. We also remaining references to `Conditions`. Related issue: https://github.com/tektoncd/pipeline/issues/3377. --- docs/deprecations.md | 1 - pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go | 2 -- 2 files changed, 3 deletions(-) diff --git a/docs/deprecations.md b/docs/deprecations.md index 906ab282678..806715d3a2b 100644 --- a/docs/deprecations.md +++ b/docs/deprecations.md @@ -21,7 +21,6 @@ being deprecated. |---------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------|-------------------------------------| | [The `TaskRun.Status.ResourceResults.ResourceRef` field is deprecated and will be removed.](https://github.com/tektoncd/pipeline/issues/2694) | [v0.14.0](https://github.com/tektoncd/pipeline/releases/tag/v0.14.0) | Beta | April 30 2021 | | [The `PipelineRun.Spec.ServiceAccountNames` field is deprecated and will be removed.](https://github.com/tektoncd/pipeline/issues/2614) | [v0.15.0](https://github.com/tektoncd/pipeline/releases/tag/v0.15.0) | Beta | May 15 2021 | -| [`Conditions` CRD is deprecated and will be removed. Use `when` expressions instead.](https://github.com/tektoncd/community/blob/main/teps/0007-conditions-beta.md) | [v0.16.0](https://github.com/tektoncd/pipeline/releases/tag/v0.16.0) | Alpha | Nov 02 2020 | | [`PipelineRunCancelled` is deprecated and will be removed](https://github.com/tektoncd/pipeline/issues/4611) | [v0.25.0](https://github.com/tektoncd/pipeline/releases/tag/v0.25.0) | Beta | July 12 2022 | | [`PipelineResources` are deprecated.](https://github.com/tektoncd/community/blob/main/teps/0074-deprecate-pipelineresources.md) | [v0.30.0](https://github.com/tektoncd/pipeline/releases/tag/v0.30.0) | Alpha | Dec 20 2021 | | [The `PipelineRun.Status.TaskRuns` and `PipelineRun.Status.Runs` fields are deprecated and will be removed.](https://github.com/tektoncd/community/blob/main/teps/0100-embedded-taskruns-and-runs-status-in-pipelineruns.md) | v0.35.0 | Beta | Jan 25, 2023 | diff --git a/pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go b/pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go index 30990e0259b..ce7a1a0eba3 100644 --- a/pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go +++ b/pkg/reconciler/pipelinerun/resources/pipelinerunresolution.go @@ -66,7 +66,6 @@ type ResolvedPipelineRunTask struct { Run *v1alpha1.Run PipelineTask *v1beta1.PipelineTask ResolvedTaskResources *resources.ResolvedTaskResources - // ConditionChecks ~~TaskRuns but for evaling conditions } // IsDone returns true only if the task is skipped, succeeded or failed @@ -231,7 +230,6 @@ func (t *ResolvedPipelineRunTask) skip(facts *PipelineRunFacts) TaskSkipStatus { // (3) its parent task was skipped // (4) Pipeline is in stopping state (one of the PipelineTasks failed) // (5) Pipeline is gracefully cancelled or stopped -// Note that this means Skip returns false if a conditionCheck is in progress func (t *ResolvedPipelineRunTask) Skip(facts *PipelineRunFacts) TaskSkipStatus { if facts.SkipCache == nil { facts.SkipCache = make(map[string]TaskSkipStatus)