Skip to content

Commit d6c84c5

Browse files
Merge pull request #2267 from everettraven/chore/bump-ocp-ct
OCPBUGS-54784: [release-4.18] Bump openshift/controller-tools to latest commit
2 parents e7f23be + 3de9a1b commit d6c84c5

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
lines changed

tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ require (
3232
sigs.k8s.io/yaml v1.4.0
3333
)
3434

35-
replace sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20250220135952-fe24dd6f3a0c
35+
replace sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20250409115419-a0be4596dbc5
3636

3737
require (
3838
cloud.google.com/go v0.115.0 // indirect

tools/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,8 @@ github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA
240240
github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
241241
github.com/onsi/gomega v1.34.0 h1:eSSPsPNp6ZpsG8X1OVmOTxig+CblTc4AxpPBykhe2Os=
242242
github.com/onsi/gomega v1.34.0/go.mod h1:MIKI8c+f+QLWk+hxbePD4i0LMJSExPaZOVfkoex4cAo=
243-
github.com/openshift/controller-tools v0.12.1-0.20250220135952-fe24dd6f3a0c h1:QnwzeKJQr8ziHUU5Bz83EcxZFj8Nkw6sLFRr9LFv40A=
244-
github.com/openshift/controller-tools v0.12.1-0.20250220135952-fe24dd6f3a0c/go.mod h1:80xsUppuf2iNgiThH2bzDIN5204p5E93z+YtNnAJlHA=
243+
github.com/openshift/controller-tools v0.12.1-0.20250409115419-a0be4596dbc5 h1:wAbFzvGOZWXe1/jl5waGgzwSOQAdFs7uo9y11FYaCUs=
244+
github.com/openshift/controller-tools v0.12.1-0.20250409115419-a0be4596dbc5/go.mod h1:80xsUppuf2iNgiThH2bzDIN5204p5E93z+YtNnAJlHA=
245245
github.com/openshift/crd-schema-checker v0.0.0-20241113192003-573763d3107a h1:gBheMF1vVwxfnuGHJ82f/nmUATdtewq60/yhbBqD4+M=
246246
github.com/openshift/crd-schema-checker v0.0.0-20241113192003-573763d3107a/go.mod h1:sTxJ4ZFW9r9fEdbW2v0yMRi6NcyTbx0fII4p83IQ+L8=
247247
github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=

tools/vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1170,7 +1170,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client
11701170
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client/metrics
11711171
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/common/metrics
11721172
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client
1173-
# sigs.k8s.io/controller-tools v0.15.0 => github.com/openshift/controller-tools v0.12.1-0.20250220135952-fe24dd6f3a0c
1173+
# sigs.k8s.io/controller-tools v0.15.0 => github.com/openshift/controller-tools v0.12.1-0.20250409115419-a0be4596dbc5
11741174
## explicit; go 1.22.0
11751175
sigs.k8s.io/controller-tools/cmd/controller-gen
11761176
sigs.k8s.io/controller-tools/pkg/crd
@@ -1201,4 +1201,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
12011201
## explicit; go 1.12
12021202
sigs.k8s.io/yaml
12031203
sigs.k8s.io/yaml/goyaml.v2
1204-
# sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20250220135952-fe24dd6f3a0c
1204+
# sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20250409115419-a0be4596dbc5

tools/vendor/sigs.k8s.io/controller-tools/pkg/crd/patch_schema.go

Lines changed: 18 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)