Skip to content

🌱 Upgrade sigs.k8s.io/controller-tools from v0.17.1 to v0.18.0 #2044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2025
Merged

🌱 Upgrade sigs.k8s.io/controller-tools from v0.17.1 to v0.18.0 #2044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .bingo/Variables.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.17.3
CONTROLLER_GEN := $(GOBIN)/controller-gen-v0.18.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.17.3"
@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=controller-gen.mod -o=$(GOBIN)/controller-gen-v0.17.3 "sigs.k8s.io/controller-tools/cmd/controller-gen"
@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"

CRD_DIFF := $(GOBIN)/crd-diff-v0.2.0
$(CRD_DIFF): $(BINGO_DIR)/crd-diff.mod
Expand Down
6 changes: 3 additions & 3 deletions .bingo/controller-gen.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module _ // Auto generated by https://github.com/bwplotka/bingo. DO NOT EDIT

go 1.23.0
go 1.24.0

toolchain go1.23.4
toolchain go1.24.3

require sigs.k8s.io/controller-tools v0.17.3 // cmd/controller-gen
require sigs.k8s.io/controller-tools v0.18.0 // cmd/controller-gen
53 changes: 53 additions & 0 deletions .bingo/controller-gen.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .bingo/variables.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fi

BINGO="${GOBIN}/bingo-v0.9.0"

CONTROLLER_GEN="${GOBIN}/controller-gen-v0.17.3"
CONTROLLER_GEN="${GOBIN}/controller-gen-v0.18.0"

CRD_DIFF="${GOBIN}/crd-diff-v0.2.0"

Expand Down
2 changes: 1 addition & 1 deletion config/base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.18.0
olm.operatorframework.io/feature-set: experimental
name: clustercatalogs.olm.operatorframework.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.18.0
olm.operatorframework.io/feature-set: standard
name: clustercatalogs.olm.operatorframework.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion ...base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.18.0
olm.operatorframework.io/feature-set: experimental
name: clusterextensions.olm.operatorframework.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.18.0
olm.operatorframework.io/feature-set: standard
name: clusterextensions.olm.operatorframework.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ require (
k8s.io/kubernetes v1.33.2
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/controller-runtime v0.21.0
sigs.k8s.io/controller-tools v0.17.3
sigs.k8s.io/controller-tools v0.18.0
sigs.k8s.io/yaml v1.4.0
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,8 +825,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUo
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
sigs.k8s.io/controller-tools v0.17.3 h1:lwFPLicpBKLgIepah+c8ikRBubFW5kOQyT88r3EwfNw=
sigs.k8s.io/controller-tools v0.17.3/go.mod h1:1ii+oXcYZkxcBXzwv3YZBlzjt1fvkrCGjVF73blosJI=
sigs.k8s.io/controller-tools v0.18.0 h1:rGxGZCZTV2wJreeRgqVoWab/mfcumTMmSwKzoM9xrsE=
sigs.k8s.io/controller-tools v0.18.0/go.mod h1:gLKoiGBriyNh+x1rWtUQnakUYEujErjXs9pf+x/8n1U=
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
Expand Down
4 changes: 2 additions & 2 deletions hack/tools/crd-generator/main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func TestRunGenerator(t *testing.T) {
defer os.RemoveAll(dir)
require.NoError(t, os.Mkdir(filepath.Join(dir, "standard"), 0o700))
require.NoError(t, os.Mkdir(filepath.Join(dir, "experimental"), 0o700))
runGenerator(dir, "v0.17.3")
runGenerator(dir, "v0.18.0")

f1 := filepath.Join(dir, "standard/olm.operatorframework.io_clusterextensions.yaml")
f2 := "config/base/operator-controller/crd/standard/olm.operatorframework.io_clusterextensions.yaml"
Expand Down Expand Up @@ -60,7 +60,7 @@ func TestTags(t *testing.T) {
defer os.RemoveAll(dir)
require.NoError(t, os.Mkdir(filepath.Join(dir, "standard"), 0o700))
require.NoError(t, os.Mkdir(filepath.Join(dir, "experimental"), 0o700))
runGenerator(dir, "v0.17.3", "github.com/operator-framework/operator-controller/hack/tools/crd-generator/testdata/api/v1")
runGenerator(dir, "v0.18.0", "github.com/operator-framework/operator-controller/hack/tools/crd-generator/testdata/api/v1")

f1 := filepath.Join(dir, "standard/olm.operatorframework.io_clusterextensions.yaml")
f2 := "output/standard/olm.operatorframework.io_clusterextensions.yaml"
Expand Down
2 changes: 1 addition & 1 deletion ...rd-generator/testdata/output/experimental/olm.operatorframework.io_clusterextensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.18.0
olm.operatorframework.io/feature-set: experimental
name: clusterextensions.olm.operatorframework.io
spec:
Expand Down
2 changes: 1 addition & 1 deletion ...ls/crd-generator/testdata/output/standard/olm.operatorframework.io_clusterextensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.18.0
olm.operatorframework.io/feature-set: standard
name: clusterextensions.olm.operatorframework.io
spec:
Expand Down
4 changes: 2 additions & 2 deletions manifests/standard.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.18.0
olm.operatorframework.io/feature-set: standard
name: clustercatalogs.olm.operatorframework.io
spec:
Expand Down Expand Up @@ -453,7 +453,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.17.3
controller-gen.kubebuilder.io/version: v0.18.0
olm.operatorframework.io/feature-set: standard
name: clusterextensions.olm.operatorframework.io
spec:
Expand Down
Loading