Merge pull request #260 from shipwright-io/qu1queee/v0.16.0

Update to Shipwright Build v0.16.0

Author: openshift-merge-bot[bot]

Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.15.2
+VERSION ?= 0.16.0
 
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")

bundle/manifests/shipwright-operator.clusterserviceversion.yaml

@@ -24,7 +24,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: https://github.com/shipwright-io/operator
     support: The Shipwright Contributors
-  name: shipwright-operator.v0.15.2
+  name: shipwright-operator.v0.16.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -131,6 +131,7 @@ spec:
           - watch
           - update
           - delete
+          - patch
         - apiGroups:
           - shipwright.io
           resources:
@@ -151,6 +152,7 @@ spec:
           - get
           - list
           - watch
+          - patch
         - apiGroups:
           - shipwright.io
           resources:
@@ -171,6 +173,7 @@ spec:
           - get
           - list
           - watch
+          - patch
         - apiGroups:
           - shipwright.io
           resources:
@@ -179,6 +182,7 @@ spec:
           - get
           - list
           - watch
+          - patch
         - apiGroups:
           - tekton.dev
           resources:
@@ -223,14 +227,6 @@ spec:
           - create
           - update
           - delete
-        - apiGroups:
-          - apiextensions.k8s.io
-          resources:
-          - customresourcedefinitions
-          - customresourcedefinitions/status
-          verbs:
-          - get
-          - patch
         - apiGroups:
           - ""
           resources:
@@ -785,4 +781,4 @@ spec:
   provider:
     name: The Shipwright Contributors
     url: https://shipwright.io
-  version: 0.15.2
+  version: 0.16.0

config/rbac/shipwright_build_controller_role.yaml

@@ -7,7 +7,7 @@ rules:
     resources: ['buildruns']
     # The build-run-deletion annotation sets an owner ref on BuildRun objects.
     # With the OwnerReferencesPermissionEnforcement admission controller enabled, controllers need the "delete" permission on objects that they set owner references on.
-    verbs: ['get', 'list', 'watch', 'update', 'delete']
+    verbs: ['get', 'list', 'watch', 'update', 'delete', 'patch']
   - apiGroups: ['shipwright.io']
     # BuildRuns are set as the owners of Tekton TaskRuns.
     # With the OwnerReferencesPermissionEnforcement admission controller enabled, controllers need the "update" permission on the finalizer of the parent object in the owner reference.
@@ -18,7 +18,7 @@ rules:
     verbs: ['update']
   - apiGroups: ['shipwright.io']
     resources: ['builds']
-    verbs: ['get', 'list', 'watch']
+    verbs: ['get', 'list', 'watch', 'patch']
   - apiGroups: ['shipwright.io']
     # The build-run-deletion annotation makes Builds an owner of BuildRun objects.
     # With the OwnerReferencesPermissionEnforcement admission controller enabled, controllers need the "update" permission on the finalizer of the parent object in the owner reference.
@@ -29,10 +29,10 @@ rules:
     verbs: ['update']
   - apiGroups: ['shipwright.io']
     resources: ['buildstrategies']
-    verbs: ['get', 'list', 'watch']
+    verbs: ['get', 'list', 'watch', 'patch']
   - apiGroups: ['shipwright.io']
     resources: ['clusterbuildstrategies']
-    verbs: ['get', 'list', 'watch']
+    verbs: ['get', 'list', 'watch', 'patch']
   - apiGroups: ['tekton.dev']
     resources: ['taskruns']
     # BuildRuns are set as the owners of Tekton TaskRuns.
@@ -50,6 +50,3 @@ rules:
   - apiGroups: ['']
     resources: ['serviceaccounts']
     verbs: ['get', 'list', 'watch', 'create', 'update', 'delete']
-  - apiGroups: ['apiextensions.k8s.io']
-    resources: ['customresourcedefinitions', 'customresourcedefinitions/status']
-    verbs: ['get', 'patch']

go.mod

@@ -1,23 +1,23 @@
 module github.com/shipwright-io/operator
 
-go 1.23.4
+go 1.24.0
 
 require (
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
-	github.com/go-logr/logr v1.4.2
+	github.com/go-logr/logr v1.4.3
 	github.com/manifestival/controller-runtime-client v0.4.0
 	github.com/manifestival/manifestival v0.7.2
-	github.com/onsi/ginkgo/v2 v2.22.2
-	github.com/onsi/gomega v1.36.2
-	github.com/shipwright-io/build v0.15.0
-	github.com/tektoncd/operator v0.75.0
+	github.com/onsi/ginkgo/v2 v2.23.4
+	github.com/onsi/gomega v1.37.0
+	github.com/shipwright-io/build v0.16.0
+	github.com/tektoncd/operator v0.76.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.30.9
-	k8s.io/apiextensions-apiserver v0.30.9
-	k8s.io/apimachinery v0.30.9
+	k8s.io/api v0.32.5
+	k8s.io/apiextensions-apiserver v0.32.5
+	k8s.io/apimachinery v0.33.0
 	// go mod tidy forces this to v1.5.2
 	k8s.io/client-go v1.5.2
-	sigs.k8s.io/controller-runtime v0.18.7
+	sigs.k8s.io/controller-runtime v0.20.4
 )
 
 require (
@@ -28,75 +28,80 @@ require (
 	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
-	github.com/evanphx/json-patch v5.9.11+incompatible // indirect
+	github.com/emicklei/go-restful/v3 v3.12.2 // indirect
 	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonpointer v0.21.1 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-openapi/swag v0.23.1 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.9 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
+	github.com/google/go-cmp v0.7.0 // indirect
+	github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
-	github.com/imdario/mergo v0.3.16 // indirect; indirecthttps://github.com/kubernetes/kubernetes/tree/v1.30.8
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kelseyhightower/envconfig v1.4.0 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/mailru/easyjson v0.9.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/openshift-pipelines/pipelines-as-code v0.27.2 // indirect
+	github.com/openshift-pipelines/pipelines-as-code v0.35.0 // indirect
 	github.com/openshift/api v0.0.0-20240521185306-0314f31e7774 // indirect
 	github.com/openshift/apiserver-library-go v0.0.0-20230816171015-6bfafa975bfb // indirect
 	github.com/openshift/client-go v0.0.0-20240523113335-452272e0496d // indirect
-	github.com/prometheus/client_golang v1.21.0 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.62.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/prometheus/client_golang v1.22.0 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.63.0 // indirect
+	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/prometheus/statsd_exporter v0.28.0 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
-	github.com/tektoncd/pipeline v0.68.0 // indirect
-	github.com/tektoncd/triggers v0.31.0 // indirect
+	github.com/tektoncd/pipeline v1.0.0 // indirect
+	github.com/tektoncd/triggers v0.32.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
-	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/oauth2 v0.26.0 // indirect
-	golang.org/x/sync v0.11.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/term v0.29.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
-	golang.org/x/time v0.10.0 // indirect
-	golang.org/x/tools v0.29.0 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/api v0.220.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
-	google.golang.org/grpc v1.70.0 // indirect
-	google.golang.org/protobuf v1.36.5 // indirect
+	golang.org/x/net v0.39.0 // indirect
+	golang.org/x/oauth2 v0.30.0 // indirect
+	golang.org/x/sync v0.14.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/term v0.31.0 // indirect
+	golang.org/x/text v0.24.0 // indirect
+	golang.org/x/time v0.11.0 // indirect
+	golang.org/x/tools v0.32.0 // indirect
+	gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
+	google.golang.org/api v0.231.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250428153025-10db94c68c34 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34 // indirect
+	google.golang.org/grpc v1.72.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20240403164606-bc84c2ddaf99 // indirect
-	k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
-	knative.dev/pkg v0.0.0-20240416145024-0f34a8815650 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
+	k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
+	knative.dev/pkg v0.0.0-20250424013628-d5e74d29daa3 // indirect
+	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
+require (
+	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
+	github.com/google/btree v1.1.3 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
+	go.uber.org/automaxprocs v1.6.0 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+)
+
 // Go modules at times does not effectively resolve transitive dependencies that share
 // k8s.io/* packages. These should be kept internally consistent with a "common" k8s version - this
 // is more of an art than a science, and can change with successive dependency updates.
@@ -108,4 +113,4 @@ require (
 // go module version standardization (v0.y.z, with y and z representing the k8s 1.y.z minor/patch
 // versions). `go mod tidy` will often overwrite the desired client-go version to v1.5.2, so we
 // pin the version here.
-replace k8s.io/client-go => k8s.io/client-go v0.30.9
+replace k8s.io/client-go => k8s.io/client-go v0.32.4