openshift-merge-bot · Oct 29, 2026 · Oct 29, 2026 · Oct 29, 2026
diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
@@ -13,22 +13,16 @@ GOHOSTARM    ?= $(shell $(GO) env GOHOSTARM)
 
 # Below generated variables ensure that every time a tool under each variable is invoked, the correct version
 # will be used; reinstalling only if needed.
-# For example for controller-gen variable:
+# For example for kind variable:
 #
 # In your main Makefile (for non array binaries):
 #
 #include .bingo/Variables.mk # Assuming -dir was set to .bingo .
 #
-#command: $(CONTROLLER_GEN)
-#	@echo "Running controller-gen"
-#	@$(CONTROLLER_GEN) <flags/args..>
+#command: $(KIND)
+#	@echo "Running kind"
+#	@$(KIND) <flags/args..>
 #
-CONTROLLER_GEN := $(GOBIN)/controller-gen-v0.20.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.20.0"
-	@cd $(BINGO_DIR) && GOWORK=off GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) $(GO) build -mod=mod -modfile=controller-gen.mod -o=$(GOBIN)/controller-gen-v0.20.0 "sigs.k8s.io/controller-tools/cmd/controller-gen"
-
 KIND := $(GOBIN)/kind-v0.33.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.

diff --git a/.bingo/controller-gen.mod b/.bingo/controller-gen.mod
diff --git a/.bingo/controller-gen.sum b/.bingo/controller-gen.sum
diff --git a/.bingo/variables.env b/.bingo/variables.env
@@ -8,8 +8,6 @@ if [ -z "$GOBIN" ]; then
 fi
 
 
-CONTROLLER_GEN="${GOBIN}/controller-gen-v0.20.0"
-
 KIND="${GOBIN}/kind-v0.33.0"
 
 OPENAPI_GEN="${GOBIN}/openapi-gen-v0.0.0-20260127142750-a19766b6e2d4"

diff --git a/Makefile b/Makefile
@@ -17,10 +17,12 @@ SPECIFIC_SKIP_UNIT_TEST := $(if $(SKIP),-skip $(SKIP),)
 
 .DEFAULT_GOAL := help
 
-# bingo manages consistent tooling versions for binary dependencies in a way 
-# which isn't sensitive to user environments
+# Bingo manages the remaining binary dependencies independently of the main module.
 include .bingo/Variables.mk
 
+# Build controller-gen from the version pinned by go.mod for the host platform.
+CONTROLLER_GEN := GOOS=$(GOHOSTOS) GOARCH=$(GOHOSTARCH) GOARM=$(GOHOSTARM) go tool controller-gen
+
 .PHONY: help
 help: ## Show this help screen
 	@echo 'Usage: make <OPTIONS> ... <TARGETS>'
@@ -55,7 +57,7 @@ tidy: ## Update dependencies
 clean: ## Clean up the build artifacts
 	$(Q)rm -rf build
 
-generate: $(CONTROLLER_GEN) generate-openapi ## Generate code
+generate: generate-openapi ## Generate code
 	$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./...
 
 generate-openapi: $(OPENAPI_GEN) ## Generate OpenAPIModelName() functions and OpenAPI definitions
@@ -73,7 +75,7 @@ generate-openapi: $(OPENAPI_GEN) ## Generate OpenAPIModelName() functions and Op
 		./pkg/operators/v1alpha1 \
 		./pkg/lib/version
 
-manifests: $(CONTROLLER_GEN) $(YQ) ## Generate manifests e.g. CRD, RBAC etc
+manifests: $(YQ) ## Generate manifests e.g. CRD, RBAC etc
 	@# Create CRDs for new APIs
 	$(CONTROLLER_GEN) crd:crdVersions=v1 output:crd:dir=./crds paths=./pkg/operators/...
 

diff --git a/crds/operators.coreos.com_catalogsources.yaml b/crds/operators.coreos.com_catalogsources.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.0
+    controller-gen.kubebuilder.io/version: v0.22.0
   name: catalogsources.operators.coreos.com
 spec:
   group: operators.coreos.com

diff --git a/crds/operators.coreos.com_clusterserviceversions.yaml b/crds/operators.coreos.com_clusterserviceversions.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.0
+    controller-gen.kubebuilder.io/version: v0.22.0
   name: clusterserviceversions.operators.coreos.com
 spec:
   group: operators.coreos.com

diff --git a/crds/operators.coreos.com_installplans.yaml b/crds/operators.coreos.com_installplans.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.0
+    controller-gen.kubebuilder.io/version: v0.22.0
   name: installplans.operators.coreos.com
 spec:
   group: operators.coreos.com

diff --git a/crds/operators.coreos.com_olmconfigs.yaml b/crds/operators.coreos.com_olmconfigs.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.0
+    controller-gen.kubebuilder.io/version: v0.22.0
   name: olmconfigs.operators.coreos.com
 spec:
   group: operators.coreos.com

diff --git a/crds/operators.coreos.com_operatorconditions.yaml b/crds/operators.coreos.com_operatorconditions.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.0
+    controller-gen.kubebuilder.io/version: v0.22.0
   name: operatorconditions.operators.coreos.com
 spec:
   group: operators.coreos.com

diff --git a/crds/operators.coreos.com_operatorgroups.yaml b/crds/operators.coreos.com_operatorgroups.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.0
+    controller-gen.kubebuilder.io/version: v0.22.0
   name: operatorgroups.operators.coreos.com
 spec:
   group: operators.coreos.com

diff --git a/crds/operators.coreos.com_operators.yaml b/crds/operators.coreos.com_operators.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.0
+    controller-gen.kubebuilder.io/version: v0.22.0
   name: operators.operators.coreos.com
 spec:
   group: operators.coreos.com

diff --git a/crds/operators.coreos.com_subscriptions.yaml b/crds/operators.coreos.com_subscriptions.yaml
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.20.0
+    controller-gen.kubebuilder.io/version: v0.22.0
   name: subscriptions.operators.coreos.com
 spec:
   group: operators.coreos.com

diff --git a/crds/zz_defs.go b/crds/zz_defs.go
diff --git a/go.mod b/go.mod
@@ -28,6 +28,7 @@ require (
 	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.13.0 // indirect
+	github.com/fatih/color v1.19.0 // indirect
 	github.com/felixge/httpsnoop v1.1.0 // indirect
 	github.com/fxamacker/cbor/v2 v2.9.1 // indirect
 	github.com/go-logr/logr v1.4.4 // indirect
@@ -46,12 +47,15 @@ require (
 	github.com/go-openapi/swag/stringutils v0.27.1 // indirect
 	github.com/go-openapi/swag/typeutils v0.27.1 // indirect
 	github.com/go-openapi/swag/yamlutils v0.27.1 // indirect
+	github.com/gobuffalo/flect v1.0.3 // indirect
 	github.com/google/gnostic-models v0.7.1 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/kisielk/errcheck v1.8.0 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -90,11 +94,16 @@ require (
 	google.golang.org/protobuf v1.36.12 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	k8s.io/apiserver v0.37.1 // indirect
+	k8s.io/code-generator v0.37.1 // indirect
 	k8s.io/component-base v0.37.1 // indirect
+	k8s.io/gengo/v2 v2.0.0-20260408192533-25e2208e0dc3 // indirect
 	k8s.io/klog/v2 v2.140.0 // indirect
 	k8s.io/utils v0.0.0-20260626114624-be93311217bd // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.36.0 // indirect
+	sigs.k8s.io/controller-tools v0.22.0 // indirect
 	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
 	sigs.k8s.io/structured-merge-diff/v6 v6.4.2 // indirect
 )
+
+tool sigs.k8s.io/controller-tools/cmd/controller-gen
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,8 +8,6 @@ if [ -z "$GOBIN" ]; then @@
     fi
-    CONTROLLER_GEN="${GOBIN}/controller-gen-v0.20.0"
     KIND="${GOBIN}/kind-v0.33.0"
     OPENAPI_GEN="${GOBIN}/openapi-gen-v0.0.0-20260127142750-a19766b6e2d4"
@@ Expand Down @@