NO-ISSUE: Synchronize From Upstream Repositories

.bingo/Variables.mk

@@ -23,11 +23,11 @@ $(BINGO): $(BINGO_DIR)/bingo.mod
 	@echo "(re)installing $(GOBIN)/bingo-v0.9.0"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.9.0 "github.com/bwplotka/bingo"
 
-CONTROLLER_GEN := $(GOBIN)/controller-gen-v0.18.0
+CONTROLLER_GEN := $(GOBIN)/controller-gen-v0.19.0
 $(CONTROLLER_GEN): $(BINGO_DIR)/controller-gen.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/controller-gen-v0.18.0"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=controller-gen.mod -o=$(GOBIN)/controller-gen-v0.18.0 "sigs.k8s.io/controller-tools/cmd/controller-gen"
+	@echo "(re)installing $(GOBIN)/controller-gen-v0.19.0"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=controller-gen.mod -o=$(GOBIN)/controller-gen-v0.19.0 "sigs.k8s.io/controller-tools/cmd/controller-gen"
 
 CRD_DIFF := $(GOBIN)/crd-diff-v0.2.0
 $(CRD_DIFF): $(BINGO_DIR)/crd-diff.mod
@@ -59,11 +59,11 @@ $(HELM): $(BINGO_DIR)/helm.mod
 	@echo "(re)installing $(GOBIN)/helm-v3.18.4"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=helm.mod -o=$(GOBIN)/helm-v3.18.4 "helm.sh/helm/v3/cmd/helm"
 
-KIND := $(GOBIN)/kind-v0.29.0
+KIND := $(GOBIN)/kind-v0.30.0
 $(KIND): $(BINGO_DIR)/kind.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/kind-v0.29.0"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kind.mod -o=$(GOBIN)/kind-v0.29.0 "sigs.k8s.io/kind"
+	@echo "(re)installing $(GOBIN)/kind-v0.30.0"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=kind.mod -o=$(GOBIN)/kind-v0.30.0 "sigs.k8s.io/kind"
 
 KUSTOMIZE := $(GOBIN)/kustomize-v5.6.0
 $(KUSTOMIZE): $(BINGO_DIR)/kustomize.mod

.bingo/controller-gen.mod

@@ -4,4 +4,4 @@ go 1.24.0
 
 toolchain go1.24.3
 
-require sigs.k8s.io/controller-tools v0.18.0 // cmd/controller-gen
+require sigs.k8s.io/controller-tools v0.19.0 // cmd/controller-gen

.bingo/kind.mod

@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
 
 go 1.20
 
-require sigs.k8s.io/kind v0.29.0
+require sigs.k8s.io/kind v0.30.0

.bingo/kind.sum

@@ -42,6 +42,8 @@ github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
 github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
+go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ=
@@ -66,6 +68,8 @@ sigs.k8s.io/kind v0.27.0 h1:PQ3f0iAWNIj66LYkZ1ivhEg/+Zb6UPMbO+qVei/INZA=
 sigs.k8s.io/kind v0.27.0/go.mod h1:RZVFmy6qcwlSWwp6xeIUv7kXCPF3i8MXsEXxW/J+gJY=
 sigs.k8s.io/kind v0.29.0 h1:3TpCsyh908IkXXpcSnsMjWdwdWjIl7o9IMZImZCWFnI=
 sigs.k8s.io/kind v0.29.0/go.mod h1:ldWQisw2NYyM6k64o/tkZng/1qQW7OlzcN5a8geJX3o=
+sigs.k8s.io/kind v0.30.0 h1:2Xi1KFEfSMm0XDcvKnUt15ZfgRPCT0OnCBbpgh8DztY=
+sigs.k8s.io/kind v0.30.0/go.mod h1:FSqriGaoTPruiXWfRnUXNykF8r2t+fHtK0P0m1AbGF8=
 sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
 sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
 sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=

.bingo/variables.env

@@ -10,7 +10,7 @@ fi
 
 BINGO="${GOBIN}/bingo-v0.9.0"
 
-CONTROLLER_GEN="${GOBIN}/controller-gen-v0.18.0"
+CONTROLLER_GEN="${GOBIN}/controller-gen-v0.19.0"
 
 CRD_DIFF="${GOBIN}/crd-diff-v0.2.0"
 
@@ -22,7 +22,7 @@ GORELEASER="${GOBIN}/goreleaser-v1.26.2"
 
 HELM="${GOBIN}/helm-v3.18.4"
 
-KIND="${GOBIN}/kind-v0.29.0"
+KIND="${GOBIN}/kind-v0.30.0"
 
 KUSTOMIZE="${GOBIN}/kustomize-v5.6.0"
 

commitchecker.yaml

@@ -1,4 +1,4 @@
-expectedMergeBase: 8016fbd7d7cfffa14fdc62e1a7e930c7fc3d4fe8
+expectedMergeBase: 33fdce258350eb563885ee41da087491a15829bd
 upstreamBranch: main
 upstreamOrg: operator-framework
 upstreamRepo: operator-controller

config/base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
     olm.operatorframework.io/generator: experimental
   name: clustercatalogs.olm.operatorframework.io
 spec:

config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
     olm.operatorframework.io/generator: standard
   name: clustercatalogs.olm.operatorframework.io
 spec:

config/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
     olm.operatorframework.io/generator: experimental
   name: clusterextensions.olm.operatorframework.io
 spec:

config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml

@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.18.0
+    controller-gen.kubebuilder.io/version: v0.19.0
     olm.operatorframework.io/generator: standard
   name: clusterextensions.olm.operatorframework.io
 spec:

go.mod

@@ -31,26 +31,26 @@ require (
 	golang.org/x/sync v0.17.0
 	golang.org/x/tools v0.37.0
 	helm.sh/helm/v3 v3.18.6
-	k8s.io/api v0.33.4
-	k8s.io/apiextensions-apiserver v0.33.4
-	k8s.io/apimachinery v0.33.4
-	k8s.io/apiserver v0.33.4
-	k8s.io/cli-runtime v0.33.4
-	k8s.io/client-go v0.33.4
-	k8s.io/component-base v0.33.4
+	k8s.io/api v0.34.0
+	k8s.io/apiextensions-apiserver v0.34.0
+	k8s.io/apimachinery v0.34.0
+	k8s.io/apiserver v0.34.0
+	k8s.io/cli-runtime v0.34.0
+	k8s.io/client-go v0.34.0
+	k8s.io/component-base v0.34.0
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/kubernetes v1.33.4
+	k8s.io/kubernetes v1.34.0
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
-	pkg.package-operator.run/boxcutter v0.7.0
-	sigs.k8s.io/controller-runtime v0.21.0
-	sigs.k8s.io/controller-tools v0.18.0
+	pkg.package-operator.run/boxcutter v0.7.1
+	sigs.k8s.io/controller-runtime v0.22.1
+	sigs.k8s.io/controller-tools v0.19.0
 	sigs.k8s.io/crdify v0.5.0
 	sigs.k8s.io/yaml v1.6.0
 )
 
 require (
-	k8s.io/component-helpers v0.33.4 // indirect
-	k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
+	k8s.io/component-helpers v0.34.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
 )
 
 require (
@@ -128,9 +128,8 @@ require (
 	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/cel-go v0.26.0 // indirect
-	github.com/google/gnostic-models v0.6.9 // indirect
-	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+	github.com/google/cel-go v0.26.1 // indirect
+	github.com/google/gnostic-models v0.7.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
@@ -173,7 +172,7 @@ require (
 	github.com/moby/sys/userns v0.1.0 // indirect
 	github.com/moby/term v0.5.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
@@ -214,16 +213,16 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
-	go.opentelemetry.io/otel v1.37.0 // indirect
+	go.opentelemetry.io/otel v1.38.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 // indirect
-	go.opentelemetry.io/otel/metric v1.37.0 // indirect
+	go.opentelemetry.io/otel/metric v1.38.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.37.0 // indirect
-	go.opentelemetry.io/otel/trace v1.37.0 // indirect
+	go.opentelemetry.io/otel/trace v1.38.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.7.0 // indirect
 	go.podman.io/common v0.65.0 // indirect
 	go.podman.io/storage v1.60.0 // indirect
-	go.yaml.in/yaml/v2 v2.4.2 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/crypto v0.42.0 // indirect
 	golang.org/x/net v0.44.0 // indirect
@@ -232,7 +231,6 @@ require (
 	golang.org/x/term v0.35.0 // indirect
 	golang.org/x/text v0.29.0 // indirect
 	golang.org/x/time v0.13.0 // indirect
-	golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated // indirect
 	gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
 	google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
@@ -250,70 +248,70 @@ require (
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect
 	sigs.k8s.io/gateway-api v1.1.0 // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
-	sigs.k8s.io/kustomize/api v0.19.0 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
+	sigs.k8s.io/kustomize/api v0.20.1 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
 )
 
 retract v1.5.0 // contains filename with ':' which causes failure creating module zip file
 
-replace k8s.io/api => k8s.io/api v0.33.4
+replace k8s.io/api => k8s.io/api v0.34.0
 
-replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.4
+replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.34.0
 
-replace k8s.io/apimachinery => k8s.io/apimachinery v0.33.4
+replace k8s.io/apimachinery => k8s.io/apimachinery v0.34.0
 
-replace k8s.io/apiserver => k8s.io/apiserver v0.33.4
+replace k8s.io/apiserver => k8s.io/apiserver v0.34.0
 
-replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.33.4
+replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.34.0
 
-replace k8s.io/client-go => k8s.io/client-go v0.33.4
+replace k8s.io/client-go => k8s.io/client-go v0.34.0
 
-replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.33.4
+replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.34.0
 
-replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.33.4
+replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.34.0
 
-replace k8s.io/code-generator => k8s.io/code-generator v0.33.4
+replace k8s.io/code-generator => k8s.io/code-generator v0.34.0
 
-replace k8s.io/component-base => k8s.io/component-base v0.33.4
+replace k8s.io/component-base => k8s.io/component-base v0.34.0
 
-replace k8s.io/component-helpers => k8s.io/component-helpers v0.33.4
+replace k8s.io/component-helpers => k8s.io/component-helpers v0.34.0
 
-replace k8s.io/controller-manager => k8s.io/controller-manager v0.33.4
+replace k8s.io/controller-manager => k8s.io/controller-manager v0.34.0
 
-replace k8s.io/cri-api => k8s.io/cri-api v0.33.4
+replace k8s.io/cri-api => k8s.io/cri-api v0.34.0
 
-replace k8s.io/cri-client => k8s.io/cri-client v0.33.4
+replace k8s.io/cri-client => k8s.io/cri-client v0.34.0
 
-replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.33.4
+replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.34.0
 
-replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.33.4
+replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.34.0
 
-replace k8s.io/endpointslice => k8s.io/endpointslice v0.33.4
+replace k8s.io/endpointslice => k8s.io/endpointslice v0.34.0
 
-replace k8s.io/externaljwt => k8s.io/externaljwt v0.33.4
+replace k8s.io/externaljwt => k8s.io/externaljwt v0.34.0
 
-replace k8s.io/kms => k8s.io/kms v0.33.4
+replace k8s.io/kms => k8s.io/kms v0.34.0
 
-replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.33.4
+replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.34.0
 
-replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.33.4
+replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.34.0
 
-replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.33.4
+replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.34.0
 
-replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.33.4
+replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.34.0
 
-replace k8s.io/kubectl => k8s.io/kubectl v0.33.4
+replace k8s.io/kubectl => k8s.io/kubectl v0.34.0
 
-replace k8s.io/kubelet => k8s.io/kubelet v0.33.4
+replace k8s.io/kubelet => k8s.io/kubelet v0.34.0
 
-replace k8s.io/kubernetes => k8s.io/kubernetes v1.33.4
+replace k8s.io/kubernetes => k8s.io/kubernetes v1.34.0
 
-replace k8s.io/metrics => k8s.io/metrics v0.33.4
+replace k8s.io/metrics => k8s.io/metrics v0.34.0
 
-replace k8s.io/mount-utils => k8s.io/mount-utils v0.33.4
+replace k8s.io/mount-utils => k8s.io/mount-utils v0.34.0
 
-replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.33.4
+replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.34.0
 
-replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.33.4
+replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.34.0