Skip to content

Commit 50cb52d

Browse files
Merge pull request #2260 from everettraven/chore/bump-ocp-controller-tools
NO-ISSUE: tools: bump openshift controller-tools to latest commit
2 parents 3d7abe9 + b0320d3 commit 50cb52d

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.20250218152928-be0dbe446d10
35+
replace sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20250402141027-24f590ca0886
3636

3737
require (
3838
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect

tools/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,8 @@ github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM
473473
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
474474
github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
475475
github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
476-
github.com/openshift/controller-tools v0.12.1-0.20250218152928-be0dbe446d10 h1:slivXSA18sKFUUZh5sheEThoRhwzOY9xIChniKEhulU=
477-
github.com/openshift/controller-tools v0.12.1-0.20250218152928-be0dbe446d10/go.mod h1:LkvYw1gDIjjhvamu3BGP9z4bgWbtOtvK7KNF3kw1Shg=
476+
github.com/openshift/controller-tools v0.12.1-0.20250402141027-24f590ca0886 h1:Ez6hT01wFM+C1O/tY+n8AugjOTvtqgovqUFOyaF6ObI=
477+
github.com/openshift/controller-tools v0.12.1-0.20250402141027-24f590ca0886/go.mod h1:LkvYw1gDIjjhvamu3BGP9z4bgWbtOtvK7KNF3kw1Shg=
478478
github.com/openshift/crd-schema-checker v0.0.0-20241113192003-573763d3107a h1:gBheMF1vVwxfnuGHJ82f/nmUATdtewq60/yhbBqD4+M=
479479
github.com/openshift/crd-schema-checker v0.0.0-20241113192003-573763d3107a/go.mod h1:sTxJ4ZFW9r9fEdbW2v0yMRi6NcyTbx0fII4p83IQ+L8=
480480
github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=

tools/vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2162,7 +2162,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client
21622162
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client/metrics
21632163
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/common/metrics
21642164
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client
2165-
# sigs.k8s.io/controller-tools v0.15.0 => github.com/openshift/controller-tools v0.12.1-0.20250218152928-be0dbe446d10
2165+
# sigs.k8s.io/controller-tools v0.15.0 => github.com/openshift/controller-tools v0.12.1-0.20250402141027-24f590ca0886
21662166
## explicit; go 1.23.0
21672167
sigs.k8s.io/controller-tools/cmd/controller-gen
21682168
sigs.k8s.io/controller-tools/pkg/crd
@@ -2193,4 +2193,4 @@ sigs.k8s.io/structured-merge-diff/v4/value
21932193
## explicit; go 1.12
21942194
sigs.k8s.io/yaml
21952195
sigs.k8s.io/yaml/goyaml.v2
2196-
# sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20250218152928-be0dbe446d10
2196+
# sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20250402141027-24f590ca0886

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)