From 15294e3bc3fc1a16c7e0c52ddf40564f4c2dac2f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Dec 2025 03:03:55 +0000 Subject: [PATCH] Bump github.com/tektoncd/pipeline from 1.6.0 to 1.7.0 Bumps [github.com/tektoncd/pipeline](https://github.com/tektoncd/pipeline) from 1.6.0 to 1.7.0. - [Release notes](https://github.com/tektoncd/pipeline/releases) - [Changelog](https://github.com/tektoncd/pipeline/blob/main/releases.md) - [Commits](https://github.com/tektoncd/pipeline/compare/v1.6.0...v1.7.0) --- updated-dependencies: - dependency-name: github.com/tektoncd/pipeline dependency-version: 1.7.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- .../pipeline/v1beta1/pipeline_validation.go | 4 ++++ .../framework/cache/annotated_resource.go | 20 +++++++++---------- .../resolver/framework/cache/cache.go | 16 ++++++++++----- .../resolver/framework/cache/clock.go | 8 -------- .../tektoncd/pipeline/test/e2e-tests.sh | 2 +- .../tektoncd/pipeline/test/multiarch_utils.go | 20 +++++++++---------- .../tektoncd/pipeline/test/path_filtering.go | 1 - .../tektoncd/pipeline/test/secret.go | 1 - .../github.com/tektoncd/pipeline/test/util.go | 1 - .../github.com/tektoncd/pipeline/test/wait.go | 2 +- vendor/modules.txt | 2 +- 13 files changed, 40 insertions(+), 43 deletions(-) diff --git a/go.mod b/go.mod index 4f7949c771..d5b891798c 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/spf13/cobra v1.10.1 github.com/spf13/viper v1.21.0 github.com/stretchr/testify v1.11.1 - github.com/tektoncd/pipeline v1.6.0 + github.com/tektoncd/pipeline v1.7.0 github.com/tektoncd/plumbing v0.0.0-20220817140952-3da8ce01aeeb go.uber.org/automaxprocs v1.6.0 go.uber.org/zap v1.27.0 diff --git a/go.sum b/go.sum index bea5a406f8..abbb3834ea 100644 --- a/go.sum +++ b/go.sum @@ -1134,8 +1134,8 @@ github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= -github.com/tektoncd/pipeline v1.6.0 h1:A+D+jzOVl2QNl/yiNT7csVgBUy2wpz6K6+/D4q5lfss= -github.com/tektoncd/pipeline v1.6.0/go.mod h1:5SNoYgRYPQopkv7ApVq5GO3JqPk2AjV+VMMjwBsbJOg= +github.com/tektoncd/pipeline v1.7.0 h1:+Rd/YGpxV8sgEmW9unSiS8RgBE4DqbPdz6zPh2pYDnk= +github.com/tektoncd/pipeline v1.7.0/go.mod h1:+HsDce5knjq77Xv9FWg1W2wTuJRznR9lLEbkVjo62lU= github.com/tektoncd/plumbing v0.0.0-20220817140952-3da8ce01aeeb h1:LUUCR8pLF+MzdQ7kOQQrMzDahIPZLdPCzfnNow1Um3Y= github.com/tektoncd/plumbing v0.0.0-20220817140952-3da8ce01aeeb/go.mod h1:uJBaI0AL/kjPThiMYZcWRujEz7D401v643d6s/21GAg= github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 h1:e/5i7d4oYZ+C1wj2THlRK+oAhjeS/TRQwMfkIuet3w0= diff --git a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1/pipeline_validation.go b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1/pipeline_validation.go index e0c9b7365e..65ef7a5edc 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1/pipeline_validation.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1/pipeline_validation.go @@ -811,6 +811,10 @@ func findAndValidateResultRefsForMatrix(tasks []PipelineTask, taskMapping map[st func validateMatrixedPipelineTaskConsumed(expressions []string, taskMapping map[string]PipelineTask) (resultRefs []*ResultRef, errs *apis.FieldError) { var filteredExpressions []string for _, expression := range expressions { + // if it is not matrix result ref expression, skip + if !resultref.LooksLikeResultRef(expression) { + continue + } // ie. "tasks..results.[*]" subExpressions := strings.Split(expression, ".") pipelineTask := subExpressions[1] // pipelineTaskName diff --git a/vendor/github.com/tektoncd/pipeline/pkg/remoteresolution/resolver/framework/cache/annotated_resource.go b/vendor/github.com/tektoncd/pipeline/pkg/remoteresolution/resolver/framework/cache/annotated_resource.go index 6a7b5b2532..7e5937cd5b 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/remoteresolution/resolver/framework/cache/annotated_resource.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/remoteresolution/resolver/framework/cache/annotated_resource.go @@ -17,8 +17,6 @@ limitations under the License. package cache import ( - "time" - v1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1" resolutionframework "github.com/tektoncd/pipeline/pkg/resolution/resolver/framework" ) @@ -46,23 +44,23 @@ type annotatedResource struct { annotations map[string]string } -// newAnnotatedResource creates a new annotatedResource with cache annotations -func newAnnotatedResource(resource resolutionframework.ResolvedResource, resolverType, operation string, clock Clock) *annotatedResource { +func newAnnotatedResource( + resource resolutionframework.ResolvedResource, + resolverType, + operation string, + timestamp string, +) *annotatedResource { // Create a new map to avoid concurrent map writes when the same resource // is being annotated from multiple goroutines existingAnnotations := resource.Annotations() annotations := make(map[string]string) - // Copy existing annotations to new map - if existingAnnotations != nil { - for k, v := range existingAnnotations { - annotations[k] = v - } + for k, v := range existingAnnotations { + annotations[k] = v } - // Add cache annotations annotations[cacheAnnotationKey] = cacheValueTrue - annotations[cacheTimestampKey] = clock.Now().Format(time.RFC3339) + annotations[cacheTimestampKey] = timestamp annotations[cacheResolverTypeKey] = resolverType annotations[cacheOperationKey] = operation diff --git a/vendor/github.com/tektoncd/pipeline/pkg/remoteresolution/resolver/framework/cache/cache.go b/vendor/github.com/tektoncd/pipeline/pkg/remoteresolution/resolver/framework/cache/cache.go index 09e49bc133..07f3671747 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/remoteresolution/resolver/framework/cache/cache.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/remoteresolution/resolver/framework/cache/cache.go @@ -38,15 +38,19 @@ type resolverCache struct { logger *zap.SugaredLogger ttl time.Duration maxSize int - clock Clock + clock utilcache.Clock } func newResolverCache(maxSize int, ttl time.Duration) *resolverCache { + return newResolverCacheWithClock(maxSize, ttl, realClock{}) +} + +func newResolverCacheWithClock(maxSize int, ttl time.Duration, clock utilcache.Clock) *resolverCache { return &resolverCache{ - cache: utilcache.NewLRUExpireCache(maxSize), + cache: utilcache.NewLRUExpireCacheWithClock(maxSize, clock), ttl: ttl, maxSize: maxSize, - clock: realClock{}, + clock: clock, } } @@ -88,7 +92,8 @@ func (c *resolverCache) Get(resolverType string, params []pipelinev1.Param) (res } c.infow("Cache hit", "key", key) - return newAnnotatedResource(resource, resolverType, cacheOperationRetrieve, c.clock), true + timestamp := c.clock.Now().Format(time.RFC3339) + return newAnnotatedResource(resource, resolverType, cacheOperationRetrieve, timestamp), true } func (c *resolverCache) infow(msg string, keysAndValues ...any) { @@ -107,7 +112,8 @@ func (c *resolverCache) Add( key := generateCacheKey(resolverType, params) c.infow("Adding to cache", "key", key, "expiration", c.ttl) - annotatedResource := newAnnotatedResource(resource, resolverType, cacheOperationStore, c.clock) + timestamp := c.clock.Now().Format(time.RFC3339) + annotatedResource := newAnnotatedResource(resource, resolverType, cacheOperationStore, timestamp) c.cache.Add(key, annotatedResource, c.ttl) diff --git a/vendor/github.com/tektoncd/pipeline/pkg/remoteresolution/resolver/framework/cache/clock.go b/vendor/github.com/tektoncd/pipeline/pkg/remoteresolution/resolver/framework/cache/clock.go index 907f3bd9d5..d1338b27e1 100644 --- a/vendor/github.com/tektoncd/pipeline/pkg/remoteresolution/resolver/framework/cache/clock.go +++ b/vendor/github.com/tektoncd/pipeline/pkg/remoteresolution/resolver/framework/cache/clock.go @@ -18,14 +18,6 @@ package cache import "time" -// Clock is an interface for getting the current time. -// This allows for testing without relying on actual time for timestamp generation. -// Note: The underlying k8s LRUExpireCache uses real time for TTL expiration checks, -// so we cannot use a fake clock to control cache expiration in tests. -type Clock interface { - Now() time.Time -} - // realClock implements Clock using the actual system time. type realClock struct{} diff --git a/vendor/github.com/tektoncd/pipeline/test/e2e-tests.sh b/vendor/github.com/tektoncd/pipeline/test/e2e-tests.sh index d97d27bb35..618719526f 100644 --- a/vendor/github.com/tektoncd/pipeline/test/e2e-tests.sh +++ b/vendor/github.com/tektoncd/pipeline/test/e2e-tests.sh @@ -174,7 +174,7 @@ function run_e2e() { # and they cause a lot of noise in the logs, making it harder to debug integration # test failures. if [ "${RUN_YAML_TESTS}" == "true" ]; then - go_test_e2e -mod=readonly -tags=examples -timeout=${E2E_GO_TEST_TIMEOUT} ./test/ + go_test_e2e -mod=readonly -parallel=6 -tags=examples -timeout=${E2E_GO_TEST_TIMEOUT} ./test/ fi if [ "${RUN_FEATUREFLAG_TESTS}" == "true" ]; then diff --git a/vendor/github.com/tektoncd/pipeline/test/multiarch_utils.go b/vendor/github.com/tektoncd/pipeline/test/multiarch_utils.go index 9cb170e2f4..b94525095f 100644 --- a/vendor/github.com/tektoncd/pipeline/test/multiarch_utils.go +++ b/vendor/github.com/tektoncd/pipeline/test/multiarch_utils.go @@ -55,24 +55,24 @@ func initImageNames() map[int]string { switch getTestArch() { case "s390x": return map[int]string{ - busyboxImage: "busybox@sha256:2f9af5cf39068ec3a9e124feceaa11910c511e23a1670dcfdff0bc16793545fb", - registryImage: "ibmcom/registry:2.6.2.5", + busyboxImage: "mirror.gcr.io/busybox@sha256:2f9af5cf39068ec3a9e124feceaa11910c511e23a1670dcfdff0bc16793545fb", + registryImage: "mirror.gcr.io/ibmcom/registry:2.6.2.5", kanikoImage: "gcr.io/kaniko-project/executor:s390x-9ed158c1f63a059cde4fd5f8b95af51d452d9aa7", - dockerizeImage: "ibmcom/dockerize-s390x", + dockerizeImage: "mirror.gcr.io/ibmcom/dockerize-s390x", } case "ppc64le": return map[int]string{ - busyboxImage: "busybox@sha256:2f9af5cf39068ec3a9e124feceaa11910c511e23a1670dcfdff0bc16793545fb", - registryImage: "ppc64le/registry:2", - kanikoImage: "ibmcom/kaniko-project-executor-ppc64le:v0.17.1", - dockerizeImage: "ibmcom/dockerize-ppc64le", + busyboxImage: "mirror.gcr.io/busybox@sha256:2f9af5cf39068ec3a9e124feceaa11910c511e23a1670dcfdff0bc16793545fb", + registryImage: "mirror.gcr.io/ppc64le/registry:2", + kanikoImage: "mirror.gcr.io/ibmcom/kaniko-project-executor-ppc64le:v0.17.1", + dockerizeImage: "mirror.gcr.io/ibmcom/dockerize-ppc64le", } default: return map[int]string{ - busyboxImage: "busybox@sha256:2f9af5cf39068ec3a9e124feceaa11910c511e23a1670dcfdff0bc16793545fb", - registryImage: "registry", + busyboxImage: "mirror.gcr.io/busybox@sha256:2f9af5cf39068ec3a9e124feceaa11910c511e23a1670dcfdff0bc16793545fb", + registryImage: "mirror.gcr.io/library/registry", kanikoImage: "gcr.io/kaniko-project/executor:v1.3.0", - dockerizeImage: "jwilder/dockerize", + dockerizeImage: "mirror.gcr.io/jwilder/dockerize", } } } diff --git a/vendor/github.com/tektoncd/pipeline/test/path_filtering.go b/vendor/github.com/tektoncd/pipeline/test/path_filtering.go index ae0d28e164..66ae486644 100644 --- a/vendor/github.com/tektoncd/pipeline/test/path_filtering.go +++ b/vendor/github.com/tektoncd/pipeline/test/path_filtering.go @@ -1,5 +1,4 @@ //go:build examples -// +build examples /* Copyright 2021 The Tekton Authors diff --git a/vendor/github.com/tektoncd/pipeline/test/secret.go b/vendor/github.com/tektoncd/pipeline/test/secret.go index bc413334ef..ce5ca9781c 100644 --- a/vendor/github.com/tektoncd/pipeline/test/secret.go +++ b/vendor/github.com/tektoncd/pipeline/test/secret.go @@ -1,5 +1,4 @@ //go:build e2e -// +build e2e /* Copyright 2019 The Tekton Authors diff --git a/vendor/github.com/tektoncd/pipeline/test/util.go b/vendor/github.com/tektoncd/pipeline/test/util.go index 849d1402ff..fe30f67971 100644 --- a/vendor/github.com/tektoncd/pipeline/test/util.go +++ b/vendor/github.com/tektoncd/pipeline/test/util.go @@ -1,5 +1,4 @@ //go:build conformance || e2e || examples || featureflags -// +build conformance e2e examples featureflags /* Copyright 2023 The Tekton Authors diff --git a/vendor/github.com/tektoncd/pipeline/test/wait.go b/vendor/github.com/tektoncd/pipeline/test/wait.go index f10fc00de5..23e5c4e7be 100644 --- a/vendor/github.com/tektoncd/pipeline/test/wait.go +++ b/vendor/github.com/tektoncd/pipeline/test/wait.go @@ -61,7 +61,7 @@ import ( const ( interval = 1 * time.Second - timeout = 10 * time.Minute + timeout = 15 * time.Minute v1Version = "v1" v1beta1Version = "v1beta1" ) diff --git a/vendor/modules.txt b/vendor/modules.txt index 8745e85a18..b194e70f33 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -499,7 +499,7 @@ github.com/stretchr/testify/require # github.com/subosito/gotenv v1.6.0 ## explicit; go 1.18 github.com/subosito/gotenv -# github.com/tektoncd/pipeline v1.6.0 +# github.com/tektoncd/pipeline v1.7.0 ## explicit; go 1.24.0 github.com/tektoncd/pipeline/internal/artifactref github.com/tektoncd/pipeline/pkg/apis/config