Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-v0.14.x] cherry-picks for 0.14.1 release #2921

Merged
merged 5 commits into from
Jul 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions config/500-webhooks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ metadata:
app.kubernetes.io/component: webhook
app.kubernetes.io/instance: default
app.kubernetes.io/part-of: tekton-pipelines
pipeline.tekton.dev/release: devel
pipeline.tekton.dev/release: "devel"
# The data is populated at install time.

---
Expand All @@ -33,7 +33,7 @@ metadata:
app.kubernetes.io/component: webhook
app.kubernetes.io/instance: default
app.kubernetes.io/part-of: tekton-pipelines
pipeline.tekton.dev/release: devel
pipeline.tekton.dev/release: "devel"
webhooks:
- admissionReviewVersions:
- v1beta1
Expand All @@ -54,7 +54,7 @@ metadata:
app.kubernetes.io/component: webhook
app.kubernetes.io/instance: default
app.kubernetes.io/part-of: tekton-pipelines
pipeline.tekton.dev/release: devel
pipeline.tekton.dev/release: "devel"
webhooks:
- admissionReviewVersions:
- v1beta1
Expand All @@ -75,7 +75,7 @@ metadata:
app.kubernetes.io/component: webhook
app.kubernetes.io/instance: default
app.kubernetes.io/part-of: tekton-pipelines
pipeline.tekton.dev/release: devel
pipeline.tekton.dev/release: "devel"
webhooks:
- admissionReviewVersions:
- v1beta1
Expand Down
6 changes: 3 additions & 3 deletions config/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ metadata:
app.kubernetes.io/name: controller
app.kubernetes.io/component: controller
app.kubernetes.io/instance: default
app.kubernetes.io/version: devel
app.kubernetes.io/version: "devel"
app.kubernetes.io/part-of: tekton-pipelines
# tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml
pipeline.tekton.dev/release: "devel"
Expand All @@ -43,7 +43,7 @@ spec:
app.kubernetes.io/name: controller
app.kubernetes.io/component: controller
app.kubernetes.io/instance: default
app.kubernetes.io/version: devel
app.kubernetes.io/version: "devel"
app.kubernetes.io/part-of: tekton-pipelines
# tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml
pipeline.tekton.dev/release: "devel"
Expand Down Expand Up @@ -117,7 +117,7 @@ metadata:
app.kubernetes.io/name: controller
app.kubernetes.io/component: controller
app.kubernetes.io/instance: default
app.kubernetes.io/version: devel
app.kubernetes.io/version: "devel"
app.kubernetes.io/part-of: tekton-pipelines
# tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml
pipeline.tekton.dev/release: "devel"
Expand Down
8 changes: 4 additions & 4 deletions config/webhook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ metadata:
app.kubernetes.io/name: webhook
app.kubernetes.io/component: webhook
app.kubernetes.io/instance: default
app.kubernetes.io/version: devel
app.kubernetes.io/version: "devel"
app.kubernetes.io/part-of: tekton-pipelines
# tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml
pipeline.tekton.dev/release: "devel"
Expand All @@ -46,7 +46,7 @@ spec:
app.kubernetes.io/name: webhook
app.kubernetes.io/component: webhook
app.kubernetes.io/instance: default
app.kubernetes.io/version: devel
app.kubernetes.io/version: "devel"
app.kubernetes.io/part-of: tekton-pipelines
# tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml
pipeline.tekton.dev/release: "devel"
Expand Down Expand Up @@ -97,10 +97,10 @@ metadata:
app.kubernetes.io/name: webhook
app.kubernetes.io/component: webhook
app.kubernetes.io/instance: default
app.kubernetes.io/version: devel
app.kubernetes.io/version: "devel"
app.kubernetes.io/part-of: tekton-pipelines
# tekton.dev/release value replaced with inputs.params.versionTag in pipeline/tekton/publish.yaml
pipeline.tekton.dev/release: devel
pipeline.tekton.dev/release: "devel"
# labels below are related to istio and should not be used for resource lookup
app: tekton-pipelines-webhook
version: "devel"
Expand Down
10 changes: 2 additions & 8 deletions docs/events.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,8 @@ No events are emitted for `Conditions` today (https://github.com/tektoncd/pipeli

# CloudEvents

When a sink is [configured](../install.md#configuring-cloudevents-notifications), the following events
will be generated by appropriate controller when a lifecycle event happens for `TaskRun` or
`PipelineRun`.
When a sink is [configured](./install.md#configuring-cloudevents-notifications), the following events
will be generated by appropriate controller when a lifecycle event happens for `TaskRun`.

The complete table of events:

Expand All @@ -65,8 +64,3 @@ TaskRun | Running | dev.tekton.event.taskrun.runnning.v1
TaskRun | Condition Change while Running | dev.tekton.event.taskrun.unknown.v1
TaskRun | Succeed | dev.tekton.event.taskrun.successful.v1
TaskRun | Failed | dev.tekton.event.taskrun.failed.v1
PipelineRun | Started | dev.tekton.event.pipelinerun.started.v1
PipelineRun | Running | dev.tekton.event.pipelinerun.runnning.v1
PipelineRun | Condition Change while Running | dev.tekton.event.pipelinerun.unknown.v1
PipelineRun | Succeed | dev.tekton.event.pipelinerun.successful.v1
PipelineRun | Failed | dev.tekton.event.pipelinerun.failed.v1
2 changes: 1 addition & 1 deletion pkg/reconciler/pipelinerun/pipelinerun_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ func TestReconcile_InvalidPipelineRuns(t *testing.T) {
permanentError: true,
wantEvents: []string{
"Normal Started",
"Warning Failed invalid input params: missing values",
"Warning Failed invalid input params for task a-task-that-needs-params: missing values",
},
}, {
name: "invalid-pipeline-run-resources-not-bound-shd-stop-reconciling",
Expand Down
3 changes: 2 additions & 1 deletion pkg/reconciler/pipelinerun/resources/apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,8 @@ func ApplyTaskResults(targets PipelineRunState, resolvedResultRefs ResolvedResul
func ApplyReplacements(p *v1beta1.PipelineSpec, replacements map[string]string, arrayReplacements map[string][]string) *v1beta1.PipelineSpec {
p = p.DeepCopy()

tasks := p.Tasks
// replace param values for both DAG and final tasks
tasks := append(p.Tasks, p.Finally...)

for i := range tasks {
tasks[i].Params = replaceParamValues(tasks[i].Params, replacements, arrayReplacements)
Expand Down
21 changes: 21 additions & 0 deletions pkg/reconciler/pipelinerun/resources/apply_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,27 @@ func TestApplyParameters(t *testing.T) {
tb.PipelineTaskParam("first-task-third-param", "static value"),
tb.PipelineTaskParam("first-task-fourth-param", "first", "fourth-value", "array"),
))),
}, {
name: "parameter evaluation with final tasks",
original: tb.Pipeline("test-pipeline",
tb.PipelineSpec(
tb.PipelineParamSpec("first-param", v1beta1.ParamTypeString, tb.ParamSpecDefault("default-value")),
tb.PipelineParamSpec("second-param", v1beta1.ParamTypeString),
tb.FinalPipelineTask("final-task-1", "final-task",
tb.PipelineTaskParam("final-task-first-param", "$(params.first-param)"),
tb.PipelineTaskParam("final-task-second-param", "$(params.second-param)"),
))),
run: tb.PipelineRun("test-pipeline-run",
tb.PipelineRunSpec("test-pipeline",
tb.PipelineRunParam("second-param", "second-value"))),
expected: tb.Pipeline("test-pipeline",
tb.PipelineSpec(
tb.PipelineParamSpec("first-param", v1beta1.ParamTypeString, tb.ParamSpecDefault("default-value")),
tb.PipelineParamSpec("second-param", v1beta1.ParamTypeString),
tb.FinalPipelineTask("final-task-1", "final-task",
tb.PipelineTaskParam("final-task-first-param", "default-value"),
tb.PipelineTaskParam("final-task-second-param", "second-value"),
))),
}}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/reconciler/taskrun/validate_resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func validateParams(paramSpecs []v1beta1.ParamSpec, params []v1alpha1.Param) err
// ValidateResolvedTaskResources validates task inputs, params and output matches taskrun
func ValidateResolvedTaskResources(params []v1alpha1.Param, rtr *resources.ResolvedTaskResources) error {
if err := validateParams(rtr.TaskSpec.Params, params); err != nil {
return fmt.Errorf("invalid input params: %w", err)
return fmt.Errorf("invalid input params for task %s: %w", rtr.TaskName, err)
}
inputs := []v1beta1.TaskResource{}
outputs := []v1beta1.TaskResource{}
Expand All @@ -120,10 +120,10 @@ func ValidateResolvedTaskResources(params []v1alpha1.Param, rtr *resources.Resol
outputs = rtr.TaskSpec.Resources.Outputs
}
if err := validateResources(inputs, rtr.Inputs); err != nil {
return fmt.Errorf("invalid input resources: %w", err)
return fmt.Errorf("invalid input resources for task %s: %w", rtr.TaskName, err)
}
if err := validateResources(outputs, rtr.Outputs); err != nil {
return fmt.Errorf("invalid output resources: %w", err)
return fmt.Errorf("invalid output resources for task %s: %w", rtr.TaskName, err)
}

return nil
Expand Down
2 changes: 1 addition & 1 deletion tekton/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ spec:
done

# Rewrite "devel" to inputs.params.versionTag
sed -i -e 's/\(pipeline.tekton.dev\/release\): "devel"/\1: "$(inputs.params.versionTag)"/g' -e 's/\(version\): "devel"/\1: "$(inputs.params.versionTag)"/g' /workspace/go/src/github.com/tektoncd/pipeline/config/*.yaml
sed -i -e 's/\(pipeline.tekton.dev\/release\): "devel"/\1: "$(inputs.params.versionTag)"/g' -e 's/\(app.kubernetes.io\/version\): "devel"/\1: "$(inputs.params.versionTag)"/g' -e 's/\(version\): "devel"/\1: "$(inputs.params.versionTag)"/g' /workspace/go/src/github.com/tektoncd/pipeline/config/*.yaml

OUTPUT_BUCKET_RELEASE_DIR="/workspace/output/bucket/previous/$(inputs.params.versionTag)"

Expand Down