[bot] Update next from tektoncd/operator to b2ee7a2058d9d5f1fe2b2a408e5f0de3c9470711

openshift-pipelines-bot · openshift-pipelines-bot · commit 3c72717672a7 · 2025-05-28T02:47:03.000Z
$ git diff --stat b2ee7a2058d9d5f1fe2b2a408e5f0de3c9470711..41fd64f439c5cea5a4c34661f86f56394085ec48 components.yaml | 2 +- docs/OpenShiftPipelinesAsCode.md | 1 - docs/TektonConfig.md | 1 - go.mod | 8 ++++---- go.sum | 8 ++++---- ...hift-pipelines-operator-rh.clusterserviceversion.template.yaml | 2 +- .../operator/v1alpha1/openshiftpipelinesascode_defaults_test.go | 3 --- .../openshiftpipelinesascode/testdata/test-additional-pac-cm.yaml | 7 ------- .../testdata/test-expected-additional-pac-cm.yaml | 7 ------- .../openshiftpipelinesascode/testdata/test-filter-manifest.yaml | 7 ------- .../pipelines-as-code/pkg/params/settings/config.go | 2 -- vendor/modules.txt | 8 ++++---- 12 files changed, 14 insertions(+), 42 deletions(-) https://github.com/tektoncd/operator/compare/b2ee7a2058d9d5f1fe2b2a408e5f0de3c9470711..41fd64f439c5cea5a4c34661f86f56394085ec48
diff --git a/.konflux/olm-catalog/bundle/kodata/tekton-addon/pipelines-as-code/v0.35.0/release.yaml b/.konflux/olm-catalog/bundle/kodata/tekton-addon/pipelines-as-code/v0.35.0/release.yaml
diff --git a/.konflux/olm-catalog/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml b/.konflux/olm-catalog/bundle/manifests/openshift-pipelines-operator-rh.clusterserviceversion.yaml
@@ -352,7 +352,7 @@ spec:
 
     - Tekton Triggers: v0.32.0
 
-    - Pipelines as Code: v0.34.0
+    - Pipelines as Code: v0.35.0
 
     - Tekton Chains: v0.25.1
 
@@ -1319,7 +1319,7 @@ spec:
                       - name: IMAGE_MAG_MANUAL_APPROVAL
                         value: quay.io/openshift-pipeline/pipelines-manual-approval-gate-webhook-rhel9@sha256:f9a621346f70bf39df26327541b81863261072dfc083e6e2e5201a630b1a1a61
                       - name: IMAGE_PRUNER_CONTROLLER
-                        value: registry.redhat.io/openshift-pipelines/pipelines-pruner-controller-rhel9@
+                        value: quay.io/openshift-pipeline/pipelines-pruner-controller-rhel9@sha256:40610e4dddff84c61f718ea4524833d21a63eea283740781f17238fa9ef7d503
                       - name: IMAGE_PAC_PAC_CONTROLLER
                         value: quay.io/openshift-pipeline/pipelines-pipelines-as-code-controller-rhel9@sha256:53d646bcc100c0fc0ad0e142d32547fe47c425e961a64add0e66a1d0b1c9d92a
                       - name: IMAGE_PAC_PAC_WEBHOOK
@@ -1583,7 +1583,7 @@ spec:
       name: IMAGE_MAG_TEKTON_TASKGROUP_CONTROLLER
     - image: quay.io/openshift-pipeline/pipelines-manual-approval-gate-webhook-rhel9@sha256:f9a621346f70bf39df26327541b81863261072dfc083e6e2e5201a630b1a1a61
       name: IMAGE_MAG_MANUAL_APPROVAL
-    - image: registry.redhat.io/openshift-pipelines/pipelines-pruner-controller-rhel9@
+    - image: quay.io/openshift-pipeline/pipelines-pruner-controller-rhel9@sha256:40610e4dddff84c61f718ea4524833d21a63eea283740781f17238fa9ef7d503
       name: IMAGE_PRUNER_CONTROLLER
     - image: quay.io/openshift-pipeline/pipelines-pipelines-as-code-controller-rhel9@sha256:53d646bcc100c0fc0ad0e142d32547fe47c425e961a64add0e66a1d0b1c9d92a
       name: IMAGE_PAC_PAC_CONTROLLER
diff --git a/.konflux/patches/0000-go1.23.patch b/.konflux/patches/0000-go1.23.patch
@@ -1,5 +1,5 @@
 diff --git a/go.mod b/go.mod
-index 89f957597..667145173 100644
+index 01f87a74c..59725840d 100644
 --- a/go.mod
 +++ b/go.mod
 @@ -1,8 +1,8 @@
@@ -14,7 +14,7 @@ index 89f957597..667145173 100644
  require (
  	github.com/Masterminds/semver v1.5.0
 diff --git a/vendor/modules.txt b/vendor/modules.txt
-index 688610f6d..9be9fec40 100644
+index ba1561886..1d3d70c3a 100644
 --- a/vendor/modules.txt
 +++ b/vendor/modules.txt
 @@ -917,7 +917,7 @@ github.com/oklog/ulid
@@ -29,7 +29,7 @@ index 688610f6d..9be9fec40 100644
 @@ -1015,7 +1015,7 @@ github.com/opencontainers/go-digest
  github.com/opencontainers/image-spec/specs-go
  github.com/opencontainers/image-spec/specs-go/v1
- # github.com/openshift-pipelines/pipelines-as-code v0.34.0
+ # github.com/openshift-pipelines/pipelines-as-code v0.35.0
 -## explicit; go 1.23.8
 +## explicit; go 1.23.6
  github.com/openshift-pipelines/pipelines-as-code/pkg/cli
diff --git a/head b/head
@@ -1 +1 @@
-41fd64f439c5cea5a4c34661f86f56394085ec48
+b2ee7a2058d9d5f1fe2b2a408e5f0de3c9470711
diff --git a/upstream/components.yaml b/upstream/components.yaml
@@ -15,7 +15,7 @@ pipeline:
   version: v1.0.0
 pipelines-as-code:
   github: openshift-pipelines/pipelines-as-code
-  version: v0.34.0
+  version: v0.35.0
 pruner:
   github: openshift-pipelines/tektoncd-pruner
   version: v0.1.0
diff --git a/upstream/docs/OpenShiftPipelinesAsCode.md b/upstream/docs/OpenShiftPipelinesAsCode.md
@@ -44,6 +44,7 @@ It is recommended that you install OpenShiftPipelinesAsCode through [TektonConfi
         enable-cancel-in-progress-on-push: "false"
         hub-catalog-name: tekton
         hub-url: https://api.hub.tekton.dev/v1
+        skip-push-event-for-pr-commits: "true"
         remote-tasks: "true"
         secret-auto-create: "true"
         secret-github-app-token-scoped: "true"
diff --git a/upstream/docs/TektonConfig.md b/upstream/docs/TektonConfig.md
@@ -153,6 +153,7 @@ platforms:
           enable-cancel-in-progress-on-push: "false"
           hub-catalog-name: tekton
           hub-url: https://api.hub.tekton.dev/v1
+          skip-push-event-for-pr-commits: "true"
           remote-tasks: "true"
           secret-auto-create: "true"
           secret-github-app-token-scoped: "true"
diff --git a/upstream/go.mod b/upstream/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/manifestival/client-go-client v0.6.0
 	github.com/manifestival/manifestival v0.7.2
 	github.com/markbates/inflect v1.0.4
-	github.com/openshift-pipelines/pipelines-as-code v0.34.0
+	github.com/openshift-pipelines/pipelines-as-code v0.35.0
 	github.com/openshift/api v0.0.0-20240521185306-0314f31e7774
 	github.com/openshift/apiserver-library-go v0.0.0-20230816171015-6bfafa975bfb
 	github.com/openshift/client-go v0.0.0-20240523113335-452272e0496d
@@ -30,11 +30,11 @@ require (
 	golang.org/x/sync v0.14.0
 	gomodules.xyz/jsonpatch/v2 v2.5.0
 	gotest.tools/v3 v3.5.2
-	k8s.io/api v0.32.4
-	k8s.io/apiextensions-apiserver v0.32.4
+	k8s.io/api v0.32.5
+	k8s.io/apiextensions-apiserver v0.32.5
 	k8s.io/apimachinery v0.33.0
 	k8s.io/client-go v1.5.2
-	k8s.io/code-generator v0.32.4
+	k8s.io/code-generator v0.32.5
 	knative.dev/pkg v0.0.0-20250424013628-d5e74d29daa3
 	sigs.k8s.io/yaml v1.4.0
 )
diff --git a/upstream/go.sum b/upstream/go.sum
@@ -936,8 +936,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
 github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
-github.com/openshift-pipelines/pipelines-as-code v0.34.0 h1:G6bJMORGmfkmdbWWgHloKaHLTEcQo5dBCpXbd+WcdeA=
-github.com/openshift-pipelines/pipelines-as-code v0.34.0/go.mod h1:jgKlfu9pXP07KD27JuhmxDaNElmNFD+lPl/b5sizT9k=
+github.com/openshift-pipelines/pipelines-as-code v0.35.0 h1:O6nUjazm1crEgp7kspRwXAHVkMD3llrI2iGpc3nYv68=
+github.com/openshift-pipelines/pipelines-as-code v0.35.0/go.mod h1:sWw55rgEurnYNKkpItE0iBrczF3Nv/XTUzWEiYSmrVY=
 github.com/openshift/api v0.0.0-20240521185306-0314f31e7774 h1:SsoLnIil/D0FcjUbQ9Z8h95B7rxFvrso2X6OQjR8jPw=
 github.com/openshift/api v0.0.0-20240521185306-0314f31e7774/go.mod h1:7Hm1kLJGxWT6eysOpD2zUztdn+w91eiERn6KtI5o9aw=
 github.com/openshift/apiserver-library-go v0.0.0-20230816171015-6bfafa975bfb h1:UMgJny13BBcHpY+JQ9Eg1Dm9+J7nWO3eqPvV1Zpd49A=
@@ -1988,8 +1988,8 @@ honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
 k8s.io/api v0.32.4 h1:kw8Y/G8E7EpNy7gjB8gJZl3KJkNz8HM2YHrZPtAZsF4=
 k8s.io/api v0.32.4/go.mod h1:5MYFvLvweRhyKylM3Es/6uh/5hGp0dg82vP34KifX4g=
 k8s.io/apiextensions-apiserver v0.27.7/go.mod h1:x0p+b5a955lfPz9gaDeBy43obM12s+N9dNHK6+dUL+g=
-k8s.io/apiextensions-apiserver v0.32.4 h1:IA+CoR63UDOijR/vEpow6wQnX4V6iVpzazJBskHrpHE=
-k8s.io/apiextensions-apiserver v0.32.4/go.mod h1:Y06XO/b92H8ymOdG1HlA1submf7gIhbEDc3RjriqZOs=
+k8s.io/apiextensions-apiserver v0.32.5 h1:o0aKvmzIIs8Uk54pidk32pxET+Pg2ULnh9WI1PuKTwE=
+k8s.io/apiextensions-apiserver v0.32.5/go.mod h1:5fpedJa3HJJFBukAZ6ur91DEDye5gYuXISPbOiNLYpU=
 k8s.io/apimachinery v0.32.4 h1:8EEksaxA7nd7xWJkkwLDN4SvWS5ot9g6Z/VZb3ju25I=
 k8s.io/apimachinery v0.32.4/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
 k8s.io/apiserver v0.27.7/go.mod h1:OrLG9RwCOerutAlo8QJW5EHzUG9Dad7k6rgcDUNSO/w=
diff --git a/upstream/operatorhub/openshift/manifests/bases/openshift-pipelines-operator-rh.clusterserviceversion.template.yaml b/upstream/operatorhub/openshift/manifests/bases/openshift-pipelines-operator-rh.clusterserviceversion.template.yaml
@@ -332,7 +332,7 @@ spec:
 
     - Tekton Pipelines: v1.0.0
     - Tekton Triggers: v0.32.0
-    - Pipelines as Code: v0.34.0
+    - Pipelines as Code: v0.35.0
     - Tekton Chains: v0.25.1
     - Tekton Hub (tech-preview): v1.21.0
     - Tekton Results (tech-preview): v0.15.0
diff --git a/upstream/pkg/apis/operator/v1alpha1/openshiftpipelinesascode_defaults_test.go b/upstream/pkg/apis/operator/v1alpha1/openshiftpipelinesascode_defaults_test.go
@@ -62,6 +62,7 @@ func TestSetPACControllerDefaultSettings(t *testing.T) {
 		"hub-url":                                    "https://api.hub.tekton.dev/v1",
 		"max-keep-run-upper-limit":                   "0",
 		"remember-ok-to-test":                        "false",
+		"skip-push-event-for-pr-commits":             "true",
 		"remote-tasks":                               "true",
 		"secret-auto-create":                         "true",
 		"secret-github-app-scope-extra-repos":        "",
@@ -117,6 +118,7 @@ func TestSetPACControllerLimitedSettings(t *testing.T) {
 		"hub-url":                                    "https://api.hub.tekton.dev/v1",
 		"max-keep-run-upper-limit":                   "0",
 		"remember-ok-to-test":                        "false",
+		"skip-push-event-for-pr-commits":             "true",
 		"remote-tasks":                               "true",
 		"secret-auto-create":                         "true",
 		"secret-github-app-scope-extra-repos":        "",
@@ -177,6 +179,7 @@ func TestSetPACControllerDefaultSettingsWithMultipleCatalogs(t *testing.T) {
 		"hub-url":                                    "https://api.hub.tekton.dev/v1",
 		"max-keep-run-upper-limit":                   "0",
 		"remember-ok-to-test":                        "false",
+		"skip-push-event-for-pr-commits":             "true",
 		"remote-tasks":                               "true",
 		"secret-auto-create":                         "true",
 		"secret-github-app-scope-extra-repos":        "",
diff --git a/upstream/pkg/reconciler/openshift/openshiftpipelinesascode/testdata/test-additional-pac-cm.yaml b/upstream/pkg/reconciler/openshift/openshiftpipelinesascode/testdata/test-additional-pac-cm.yaml
@@ -126,6 +126,13 @@ data:
   # you may want to disable this if ok-to-test should be done on each iteration
   remember-ok-to-test: "false"
 
+  # When enabled, this option prevents duplicate pipeline runs when a commit appears in
+  # both a push event and a pull request. If a push event comes from a commit that is
+  # part of an open pull request, the push event will be skipped as it would create
+  # a duplicate pipeline run.
+  # Default: true
+  skip-push-event-for-pr-commits: "true"
+
   # Configure a custom console here, the driver support custom parameters from
   # Repo CR along a few other template variable, see documentation for more
   # details
diff --git a/upstream/pkg/reconciler/openshift/openshiftpipelinesascode/testdata/test-expected-additional-pac-cm.yaml b/upstream/pkg/reconciler/openshift/openshiftpipelinesascode/testdata/test-expected-additional-pac-cm.yaml
@@ -125,6 +125,13 @@ data:
   # you may want to disable this if ok-to-test should be done on each iteration
   remember-ok-to-test: "false"
 
+  # When enabled, this option prevents duplicate pipeline runs when a commit appears in
+  # both a push event and a pull request. If a push event comes from a commit that is
+  # part of an open pull request, the push event will be skipped as it would create
+  # a duplicate pipeline run.
+  # Default: true
+  skip-push-event-for-pr-commits: "true"
+
   # Configure a custom console here, the driver support custom parameters from
   # Repo CR along a few other template variable, see documentation for more
   # details
diff --git a/upstream/pkg/reconciler/openshift/openshiftpipelinesascode/testdata/test-filter-manifest.yaml b/upstream/pkg/reconciler/openshift/openshiftpipelinesascode/testdata/test-filter-manifest.yaml
@@ -143,6 +143,13 @@ data:
   # you may want to disable this if ok-to-test should be done on each iteration
   remember-ok-to-test: "true"
 
+  # When enabled, this option prevents duplicate pipeline runs when a commit appears in
+  # both a push event and a pull request. If a push event comes from a commit that is
+  # part of an open pull request, the push event will be skipped as it would create
+  # a duplicate pipeline run.
+  # Default: true
+  skip-push-event-for-pr-commits: "true"
+
   # Configure a custom console here, the driver support custom parameters from
   # Repo CR along a few other template variable, see documentation for more
   # details
diff --git a/upstream/vendor/github.com/openshift-pipelines/pipelines-as-code/pkg/params/settings/config.go b/upstream/vendor/github.com/openshift-pipelines/pipelines-as-code/pkg/params/settings/config.go
diff --git a/upstream/vendor/modules.txt b/upstream/vendor/modules.txt
@@ -1014,7 +1014,7 @@ github.com/opencontainers/go-digest
 ## explicit; go 1.18
 github.com/opencontainers/image-spec/specs-go
 github.com/opencontainers/image-spec/specs-go/v1
-# github.com/openshift-pipelines/pipelines-as-code v0.34.0
+# github.com/openshift-pipelines/pipelines-as-code v0.35.0
 ## explicit; go 1.23.8
 github.com/openshift-pipelines/pipelines-as-code/pkg/cli
 github.com/openshift-pipelines/pipelines-as-code/pkg/configutil
@@ -1809,7 +1809,7 @@ gotest.tools/v3/internal/cleanup
 gotest.tools/v3/internal/difflib
 gotest.tools/v3/internal/format
 gotest.tools/v3/internal/source
-# k8s.io/api v0.32.4 => k8s.io/api v0.32.4
+# k8s.io/api v0.32.5 => k8s.io/api v0.32.4
 ## explicit; go 1.23.0
 k8s.io/api/admission/v1
 k8s.io/api/admissionregistration/v1
@@ -1869,7 +1869,7 @@ k8s.io/api/storage/v1
 k8s.io/api/storage/v1alpha1
 k8s.io/api/storage/v1beta1
 k8s.io/api/storagemigration/v1alpha1
-# k8s.io/apiextensions-apiserver v0.32.4
+# k8s.io/apiextensions-apiserver v0.32.5
 ## explicit; go 1.23.0
 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
@@ -2278,7 +2278,7 @@ k8s.io/client-go/util/keyutil
 k8s.io/client-go/util/retry
 k8s.io/client-go/util/watchlist
 k8s.io/client-go/util/workqueue
-# k8s.io/code-generator v0.32.4 => k8s.io/code-generator v0.32.4
+# k8s.io/code-generator v0.32.5 => k8s.io/code-generator v0.32.4
 ## explicit; go 1.23.0
 k8s.io/code-generator/cmd/client-gen
 k8s.io/code-generator/cmd/client-gen/args

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-41fd64f439c5cea5a4c34661f86f56394085ec48`
	`1`	`+b2ee7a2058d9d5f1fe2b2a408e5f0de3c9470711`