Skip to content

Commit c9291ff

Browse files
tmshorttmshort
committed
Update controller-tools to v0.20.1
Update the bingo tool, test files and CRDs Signed-off-by: Todd Short <tshort@redhat.com>
1 parent c7c98db commit c9291ff

18 files changed

+31
-23
lines changed

‎.bingo/Variables.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ $(CONFTEST): $(BINGO_DIR)/conftest.mod
2929
@echo "(re)installing $(GOBIN)/conftest-v0.62.0"
3030
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=conftest.mod -o=$(GOBIN)/conftest-v0.62.0 "github.com/open-policy-agent/conftest"
3131

32-
CONTROLLER_GEN := $(GOBIN)/controller-gen-v0.20.0
32+
CONTROLLER_GEN := $(GOBIN)/controller-gen-v0.20.1
3333
$(CONTROLLER_GEN): $(BINGO_DIR)/controller-gen.mod
3434
@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
35-
@echo "(re)installing $(GOBIN)/controller-gen-v0.20.0"
36-
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=controller-gen.mod -o=$(GOBIN)/controller-gen-v0.20.0 "sigs.k8s.io/controller-tools/cmd/controller-gen"
35+
@echo "(re)installing $(GOBIN)/controller-gen-v0.20.1"
36+
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=controller-gen.mod -o=$(GOBIN)/controller-gen-v0.20.1 "sigs.k8s.io/controller-tools/cmd/controller-gen"
3737

3838
CRD_DIFF := $(GOBIN)/crd-diff-v0.5.0
3939
$(CRD_DIFF): $(BINGO_DIR)/crd-diff.mod

‎.bingo/controller-gen.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT
22

33
go 1.25.0
44

5-
require sigs.k8s.io/controller-tools v0.20.0 // cmd/controller-gen
5+
require sigs.k8s.io/controller-tools v0.20.1 // cmd/controller-gen

‎.bingo/controller-gen.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ sigs.k8s.io/controller-tools v0.19.0 h1:OU7jrPPiZusryu6YK0jYSjPqg8Vhf8cAzluP9XGI
175175
sigs.k8s.io/controller-tools v0.19.0/go.mod h1:y5HY/iNDFkmFla2CfQoVb2AQXMsBk4ad84iR1PLANB0=
176176
sigs.k8s.io/controller-tools v0.20.0 h1:VWZF71pwSQ2lZZCt7hFGJsOfDc5dVG28/IysjjMWXL8=
177177
sigs.k8s.io/controller-tools v0.20.0/go.mod h1:b4qPmjGU3iZwqn34alUU5tILhNa9+VXK+J3QV0fT/uU=
178+
sigs.k8s.io/controller-tools v0.20.1 h1:gkfMt9YodI0K85oT8rVi80NTXO/kDmabKR5Ajn5GYxs=
179+
sigs.k8s.io/controller-tools v0.20.1/go.mod h1:b4qPmjGU3iZwqn34alUU5tILhNa9+VXK+J3QV0fT/uU=
178180
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
179181
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
180182
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=

‎.bingo/variables.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ BINGO="${GOBIN}/bingo-v0.9.0"
1212

1313
CONFTEST="${GOBIN}/conftest-v0.62.0"
1414

15-
CONTROLLER_GEN="${GOBIN}/controller-gen-v0.20.0"
15+
CONTROLLER_GEN="${GOBIN}/controller-gen-v0.20.1"
1616

1717
CRD_DIFF="${GOBIN}/crd-diff-v0.5.0"
1818

‎go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,9 @@ require (
244244
gopkg.in/warnings.v0 v0.1.2 // indirect
245245
gopkg.in/yaml.v2 v2.4.0 // indirect
246246
gopkg.in/yaml.v3 v3.0.1 // indirect
247+
k8s.io/code-generator v0.35.0 // indirect
247248
k8s.io/controller-manager v0.33.2 // indirect
249+
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
248250
k8s.io/kubectl v0.35.0 // indirect
249251
oras.land/oras-go/v2 v2.6.0 // indirect
250252
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect

‎go.sum‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,12 +778,16 @@ k8s.io/cli-runtime v0.35.0 h1:PEJtYS/Zr4p20PfZSLCbY6YvaoLrfByd6THQzPworUE=
778778
k8s.io/cli-runtime v0.35.0/go.mod h1:VBRvHzosVAoVdP3XwUQn1Oqkvaa8facnokNkD7jOTMY=
779779
k8s.io/client-go v0.35.0 h1:IAW0ifFbfQQwQmga0UdoH0yvdqrbwMdq9vIFEhRpxBE=
780780
k8s.io/client-go v0.35.0/go.mod h1:q2E5AAyqcbeLGPdoRB+Nxe3KYTfPce1Dnu1myQdqz9o=
781+
k8s.io/code-generator v0.35.0 h1:TvrtfKYZTm9oDF2z+veFKSCcgZE3Igv0svY+ehCmjHQ=
782+
k8s.io/code-generator v0.35.0/go.mod h1:iS1gvVf3c/T71N5DOGYO+Gt3PdJ6B9LYSvIyQ4FHzgc=
781783
k8s.io/component-base v0.35.0 h1:+yBrOhzri2S1BVqyVSvcM3PtPyx5GUxCK2tinZz1G94=
782784
k8s.io/component-base v0.35.0/go.mod h1:85SCX4UCa6SCFt6p3IKAPej7jSnF3L8EbfSyMZayJR0=
783785
k8s.io/component-helpers v0.35.0 h1:wcXv7HJRksgVjM4VlXJ1CNFBpyDHruRI99RrBtrJceA=
784786
k8s.io/component-helpers v0.35.0/go.mod h1:ahX0m/LTYmu7fL3W8zYiIwnQ/5gT28Ex4o2pymF63Co=
785787
k8s.io/controller-manager v0.35.0 h1:KteodmfVIRzfZ3RDaxhnHb72rswBxEngvdL9vuZOA9A=
786788
k8s.io/controller-manager v0.35.0/go.mod h1:1bVuPNUG6/dpWpevsJpXioS0E0SJnZ7I/Wqc9Awyzm4=
789+
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b h1:gMplByicHV/TJBizHd9aVEsTYoJBnnUAT5MHlTkbjhQ=
790+
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b/go.mod h1:CgujABENc3KuTrcsdpGmrrASjtQsWCT7R99mEV4U/fM=
787791
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
788792
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
789793
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 h1:HhDfevmPS+OalTjQRKbTHppRIz01AWi8s45TMXStgYY=

‎hack/tools/crd-generator/main_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1212
)
1313

14-
const controllerToolsVersion = "v0.20.0"
14+
const controllerToolsVersion = "v0.20.1"
1515

1616
func TestRunGenerator(t *testing.T) {
1717
here, err := os.Getwd()

‎hack/tools/crd-generator/testdata/output/experimental/olm.operatorframework.io_clusterextensions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.20.0
6+
controller-gen.kubebuilder.io/version: v0.20.1
77
olm.operatorframework.io/generator: experimental
88
name: clusterextensions.olm.operatorframework.io
99
spec:

‎hack/tools/crd-generator/testdata/output/standard/olm.operatorframework.io_clusterextensions.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.20.0
6+
controller-gen.kubebuilder.io/version: v0.20.1
77
olm.operatorframework.io/generator: standard
88
name: clusterextensions.olm.operatorframework.io
99
spec:

‎helm/olmv1/base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.20.0
6+
controller-gen.kubebuilder.io/version: v0.20.1
77
olm.operatorframework.io/generator: experimental
88
name: clustercatalogs.olm.operatorframework.io
99
spec:

0 commit comments

Comments
 (0)