Merge pull request #266 from adambkaplan/bump-build-v0.17.0

bump(*): Update shipwright-io/build and Tekton deps

Author: openshift-merge-bot[bot]

controllers/result.go

@@ -1,12 +1,14 @@
 package controllers
 
 import (
+	"time"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 )
 
 // Requeue triggers a object requeue.
 func Requeue() (ctrl.Result, error) {
-	return ctrl.Result{Requeue: true}, nil
+	return ctrl.Result{RequeueAfter: 1 * time.Second}, nil
 }
 
 // RequeueOnError triggers requeue when error is not nil.
@@ -16,10 +18,10 @@ func RequeueOnError(err error) (ctrl.Result, error) {
 
 // RequeueWithError triggers a object requeue because the informed error happend.
 func RequeueWithError(err error) (ctrl.Result, error) {
-	return ctrl.Result{Requeue: true}, err
+	return ctrl.Result{RequeueAfter: 1 * time.Second}, err
 }
 
 // NoRequeue all done, the object does not need reconciliation anymore.
 func NoRequeue() (ctrl.Result, error) {
-	return ctrl.Result{Requeue: false}, nil
+	return ctrl.Result{}, nil
 }

controllers/shipwrightbuild_controller.go

@@ -8,6 +8,7 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
+	"time"
 
 	"github.com/go-logr/logr"
 	"github.com/manifestival/manifestival"
@@ -180,7 +181,11 @@ func (r *ShipwrightBuildReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	// ReconcileTekton
 	_, requeue, err := tekton.ReconcileTekton(ctx, r.CRDClient, r.TektonOperatorClient)
 	if err != nil {
-		return ctrl.Result{Requeue: requeue}, err
+		requeueInterval := 0 * time.Second
+		if requeue {
+			requeueInterval = 1 * time.Second
+		}
+		return ctrl.Result{RequeueAfter: requeueInterval}, err
 	}
 	if requeue {
 		return Requeue()
@@ -261,7 +266,11 @@ func (r *ShipwrightBuildReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	if common.BoolFromEnvVar(UseManagedWebhookCerts) {
 		requeue, err = certmanager.ReconcileCertManager(ctx, r.CRDClient, r.Client, r.Logger, targetNamespace)
 		if err != nil {
-			return ctrl.Result{Requeue: requeue}, err
+			requeueInterval := 0 * time.Second
+			if requeue {
+				requeueInterval = 1 * time.Second
+			}
+			return ctrl.Result{RequeueAfter: requeueInterval}, err
 		}
 		if requeue {
 			return Requeue()

controllers/shipwrightbuild_controller_test.go

@@ -176,7 +176,7 @@ func testShipwrightBuildReconcilerReconcile(t *testing.T, targetNamespace string
 		// This makes testing brittle and unable to capture the behavior on a real cluster.
 		// Requeue can return "true" because the tests think the CRD for ClusterBuildStrategies
 		// do not exist yet.
-		g.Expect(res.Requeue).To(o.BeTrue(), "checking requeue for Reconcile")
+		g.Expect(res.RequeueAfter).NotTo(o.BeZero(), "checking requeue for Reconcile")
 		err = c.Get(ctx, deploymentName, &appsv1.Deployment{})
 		g.Expect(err).To(o.BeNil())
 		err = c.Get(ctx, namespacedName, b)
@@ -199,7 +199,7 @@ func testShipwrightBuildReconcilerReconcile(t *testing.T, targetNamespace string
 		// This makes testing brittle and unable to capture the behavior on a real cluster.
 		// Requeue can return "true" because the tests think the CRD for ClusterBuildStrategies
 		// do not exist yet.
-		g.Expect(res.Requeue).To(o.BeTrue())
+		g.Expect(res.RequeueAfter).NotTo(o.BeZero())
 		err = c.Get(ctx, deploymentName, deployment)
 		g.Expect(err).To(o.BeNil())
 		containers := deployment.Spec.Template.Spec.Containers
@@ -229,7 +229,7 @@ func testShipwrightBuildReconcilerReconcile(t *testing.T, targetNamespace string
 
 		res, err := r.Reconcile(ctx, req)
 		g.Expect(err).To(o.BeNil())
-		g.Expect(res.Requeue).To(o.BeFalse())
+		g.Expect(res.RequeueAfter).To(o.BeZero())
 
 		err = c.Get(ctx, deploymentName, &appsv1.Deployment{})
 		g.Expect(errors.IsNotFound(err)).To(o.BeTrue())
@@ -342,7 +342,7 @@ func TestShipwrightBuildReconciler_OperandReadiness(t *testing.T) {
 	req := reconcile.Request{NamespacedName: namespacedName}
 	res, err := r.Reconcile(ctx, req)
 	g.Expect(err).To(o.BeNil())
-	g.Expect(res.Requeue).To(o.BeTrue(), "Reconciliation should requeue when TektonConfig is not ready")
+	g.Expect(res.RequeueAfter).NotTo(o.BeZero(), "Reconciliation should requeue when TektonConfig is not ready")
 
 	// Verify that the ShipwrightBuild is marked as not ready
 	updated := &v1alpha1.ShipwrightBuild{}
@@ -363,7 +363,7 @@ func TestShipwrightBuildReconciler_OperandReadiness(t *testing.T) {
 	// Trigger reconciliation again
 	res, err = r.Reconcile(ctx, req)
 	g.Expect(err).To(o.BeNil())
-	g.Expect(res.Requeue).To(o.BeFalse(), "Should not requeue after TektonConfig is ready")
+	g.Expect(res.RequeueAfter).To(o.BeZero(), "Should not requeue after TektonConfig is ready")
 
 	// Fetch and verify ShipwrightBuild is now ready
 	err = c.Get(ctx, req.NamespacedName, updated)

go.mod

@@ -7,30 +7,34 @@ require (
 	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.23.4
-	github.com/onsi/gomega v1.37.0
-	github.com/shipwright-io/build v0.16.0
-	github.com/tektoncd/operator v0.76.0
+	github.com/onsi/ginkgo/v2 v2.25.1
+	github.com/onsi/gomega v1.38.1
+	github.com/shipwright-io/build v0.17.0
+	github.com/tektoncd/operator v0.77.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.32.5
-	k8s.io/apiextensions-apiserver v0.32.5
-	k8s.io/apimachinery v0.33.0
+	k8s.io/api v0.33.4
+	k8s.io/apiextensions-apiserver v0.33.4
+	k8s.io/apimachinery v0.33.4
 	// go mod tidy forces this to v1.5.2
 	k8s.io/client-go v1.5.2
-	sigs.k8s.io/controller-runtime v0.20.4
+	knative.dev/pkg v0.0.0-20250424013628-d5e74d29daa3
+	sigs.k8s.io/controller-runtime v0.21.0
 )
 
 require (
-	contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect
+	contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20230502190836-7399e0f8ee5e // indirect
 	contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect
+	github.com/Masterminds/semver/v3 v3.4.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/blendle/zapdriver v1.3.1 // indirect
 	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.2 // indirect
 	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
-	github.com/fsnotify/fsnotify v1.8.0 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.8.0 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
 	github.com/go-openapi/jsonpointer v0.21.1 // indirect
 	github.com/go-openapi/jsonreference v0.21.0 // indirect
@@ -39,11 +43,12 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/btree v1.1.3 // indirect
 	github.com/google/gnostic-models v0.6.9 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
-	github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
+	github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
 	github.com/hashicorp/golang-lru v1.0.2 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@@ -52,54 +57,51 @@ require (
 	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.35.0 // indirect
+	github.com/openshift-pipelines/pipelines-as-code v0.36.0 // indirect
+	github.com/openshift-pipelines/tektoncd-pruner v0.0.0-20250711075231-9c8624123820 // 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.22.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.23.0 // indirect
 	github.com/prometheus/client_model v0.6.2 // indirect
-	github.com/prometheus/common v0.63.0 // indirect
+	github.com/prometheus/common v0.65.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 v1.0.0 // indirect
+	github.com/spf13/pflag v1.0.7 // indirect
+	github.com/tektoncd/pipeline v1.3.1 // indirect
 	github.com/tektoncd/triggers v0.32.0 // indirect
+	github.com/x448/float16 v0.8.4 // indirect
 	go.opencensus.io v0.24.0 // indirect
+	go.uber.org/automaxprocs v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/net v0.39.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
+	golang.org/x/net v0.43.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
+	golang.org/x/sync v0.16.0 // indirect
+	golang.org/x/sys v0.35.0 // indirect
+	golang.org/x/term v0.34.0 // indirect
+	golang.org/x/text v0.28.0 // indirect
+	golang.org/x/time v0.12.0 // indirect
+	golang.org/x/tools v0.36.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
+	google.golang.org/api v0.237.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
+	google.golang.org/grpc v1.74.2 // indirect
+	google.golang.org/protobuf v1.36.7 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.12.0 // 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-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
+	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
+	sigs.k8s.io/yaml v1.6.0 // indirect
 )
 
 // Go modules at times does not effectively resolve transitive dependencies that share
@@ -113,4 +115,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.32.4
+replace k8s.io/client-go => k8s.io/client-go v0.33.4