From 138cb6de5b3b63b1b70a6430b6e37ecf94e09ef7 Mon Sep 17 00:00:00 2001 From: openshift-merge-bot <148852131+openshift-merge-bot@users.noreply.github.com> Date: Fri, 18 Oct 2024 00:01:47 +0000 Subject: [PATCH] Bump Tekton Pipeline from v0.62.3 to v0.62.4 --- .github/workflows/ci.yml | 4 ++-- Makefile | 2 +- README.md | 2 +- go.mod | 2 +- go.sum | 4 ++-- hack/install-tekton.sh | 2 +- .../tektoncd/pipeline/pkg/apis/pipeline/v1/merge.go | 13 ++++++++++++- vendor/modules.txt | 2 +- 8 files changed, 21 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2823e76de6..7c5cdb22e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,7 @@ jobs: # oldest LTS that exists at the time of our planned next release - v0.53.5 # newest LTS that exists at the time of our planned next release - - v0.62.3 # RETAIN-COMMENT: TEKTON_NEWEST_LTS + - v0.62.4 # RETAIN-COMMENT: TEKTON_NEWEST_LTS max-parallel: 4 runs-on: ubuntu-latest steps: @@ -149,7 +149,7 @@ jobs: # oldest LTS that exists at the time of our planned next release - v0.53.5 # newest LTS that exists at the time of our planned next release - - v0.62.3 # RETAIN-COMMENT: TEKTON_NEWEST_LTS + - v0.62.4 # RETAIN-COMMENT: TEKTON_NEWEST_LTS max-parallel: 4 runs-on: ubuntu-latest steps: diff --git a/Makefile b/Makefile index 05486bc12a..aa3b656638 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ ZAP_FLAGS ?= --zap-log-level=debug --zap-encoder=console TEST_NAMESPACE ?= default # CI: tekton pipelines controller version -TEKTON_VERSION ?= v0.62.3 +TEKTON_VERSION ?= v0.62.4 # E2E test flags TEST_E2E_FLAGS ?= -r -p --randomize-all -timeout=1h -trace -v diff --git a/README.md b/README.md index 0bccdb94f8..c9c868a332 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Shipwright supports any tool that can build container images in Kubernetes clust - We also require a Tekton installation (v0.50.+). To install the latest LTS release, run: ```bash - kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeline/previous/v0.62.3/release.yaml + kubectl apply --filename https://storage.googleapis.com/tekton-releases/pipeline/previous/v0.62.4/release.yaml ``` If you are using OpenShift cluster refer [Running on OpenShift](#running-on-openshift) for some more configurations. diff --git a/go.mod b/go.mod index da234cc674..19aa243ac3 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/prometheus/client_model v0.6.1 github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 - github.com/tektoncd/pipeline v0.62.3 + github.com/tektoncd/pipeline v0.62.4 go.uber.org/zap v1.27.0 k8s.io/api v0.29.9 k8s.io/apiextensions-apiserver v0.29.9 diff --git a/go.sum b/go.sum index 1a71184229..9b17725f72 100644 --- a/go.sum +++ b/go.sum @@ -388,8 +388,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= -github.com/tektoncd/pipeline v0.62.3 h1:hR6UKjwzChW+MNG41yjfTKiVW9xet8jbJS59tsIY7bc= -github.com/tektoncd/pipeline v0.62.3/go.mod h1:cYPH4n3X8t39arNMhgyU7swyv3hVeWToz1yYDRzTLT8= +github.com/tektoncd/pipeline v0.62.4 h1:NxDiwO3A0AskBHN19O2FgPEd54keDrEw28k4s0YOH9g= +github.com/tektoncd/pipeline v0.62.4/go.mod h1:cYPH4n3X8t39arNMhgyU7swyv3hVeWToz1yYDRzTLT8= github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8= github.com/vbatts/tar-split v0.11.3 h1:hLFqsOLQ1SsppQNTMpkpPXClLDfC2A3Zgy9OUU+RVck= github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXSTY7wGrAokY= diff --git a/hack/install-tekton.sh b/hack/install-tekton.sh index 290bdeddb0..d5c2d1530a 100755 --- a/hack/install-tekton.sh +++ b/hack/install-tekton.sh @@ -9,7 +9,7 @@ set -eu -TEKTON_VERSION="${TEKTON_VERSION:-v0.62.3}" +TEKTON_VERSION="${TEKTON_VERSION:-v0.62.4}" TEKTON_HOST="github.com" TEKTON_HOST_PATH="tektoncd/pipeline/releases/download" diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1/merge.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1/merge.go index df413a5456..b916d8caeb 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1/merge.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1/merge.go @@ -65,7 +65,18 @@ func MergeStepsWithStepTemplate(template *StepTemplate, steps []Step) ([]Step, e amendConflictingContainerFields(&merged, s) // Pass through original step Script, for later conversion. - newStep := Step{Script: s.Script, OnError: s.OnError, Timeout: s.Timeout, StdoutConfig: s.StdoutConfig, StderrConfig: s.StderrConfig, Results: s.Results, Params: s.Params, Ref: s.Ref, When: s.When} + newStep := Step{ + Script: s.Script, + OnError: s.OnError, + Timeout: s.Timeout, + StdoutConfig: s.StdoutConfig, + StderrConfig: s.StderrConfig, + Results: s.Results, + Params: s.Params, + Ref: s.Ref, + When: s.When, + Workspaces: s.Workspaces, + } newStep.SetContainerFields(merged) steps[i] = newStep } diff --git a/vendor/modules.txt b/vendor/modules.txt index 30a335cbac..786a8e5d26 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -450,7 +450,7 @@ github.com/spf13/pflag # github.com/stoewer/go-strcase v1.2.0 ## explicit; go 1.11 github.com/stoewer/go-strcase -# github.com/tektoncd/pipeline v0.62.3 +# github.com/tektoncd/pipeline v0.62.4 ## explicit; go 1.22 github.com/tektoncd/pipeline/internal/artifactref github.com/tektoncd/pipeline/pkg/apis/config