Skip to content

Commit 0b15657

Browse files
committed
Update controller-tools
1 parent 52d7b3f commit 0b15657

File tree

4 files changed

+20
-8
lines changed

4 files changed

+20
-8
lines changed

tools/go.mod

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

37-
replace sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20241105174925-ead1ef573704
37+
replace sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20250108094724-6eb6da5d6efd
3838

3939
// Temporary until we rebase to 1.32.0 or higher deps. To enable the format library early.
4040
replace k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241125210059-e3abfef0b992

tools/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -456,8 +456,8 @@ github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4
456456
github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
457457
github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
458458
github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
459-
github.com/openshift/controller-tools v0.12.1-0.20241105174925-ead1ef573704 h1:sdLkU07gS60g16e0VEHwF+KDX4ROZJS5QgnloWyUG30=
460-
github.com/openshift/controller-tools v0.12.1-0.20241105174925-ead1ef573704/go.mod h1:80xsUppuf2iNgiThH2bzDIN5204p5E93z+YtNnAJlHA=
459+
github.com/openshift/controller-tools v0.12.1-0.20250108094724-6eb6da5d6efd h1:+tHtYnbIIT0NZurG+MpoyHArg27ysMUzViFhbM3/Erw=
460+
github.com/openshift/controller-tools v0.12.1-0.20250108094724-6eb6da5d6efd/go.mod h1:80xsUppuf2iNgiThH2bzDIN5204p5E93z+YtNnAJlHA=
461461
github.com/openshift/crd-schema-checker v0.0.0-20241113192003-573763d3107a h1:gBheMF1vVwxfnuGHJ82f/nmUATdtewq60/yhbBqD4+M=
462462
github.com/openshift/crd-schema-checker v0.0.0-20241113192003-573763d3107a/go.mod h1:sTxJ4ZFW9r9fEdbW2v0yMRi6NcyTbx0fII4p83IQ+L8=
463463
github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241125210059-e3abfef0b992 h1:UHSO67L/pCyCcqZphO4PiX638s6QrpJN8OBYMkFIeYE=

tools/vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2189,7 +2189,7 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client
21892189
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client/metrics
21902190
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/common/metrics
21912191
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client
2192-
# sigs.k8s.io/controller-tools v0.15.0 => github.com/openshift/controller-tools v0.12.1-0.20241105174925-ead1ef573704
2192+
# sigs.k8s.io/controller-tools v0.15.0 => github.com/openshift/controller-tools v0.12.1-0.20250108094724-6eb6da5d6efd
21932193
## explicit; go 1.22.0
21942194
sigs.k8s.io/controller-tools/cmd/controller-gen
21952195
sigs.k8s.io/controller-tools/pkg/crd
@@ -2220,5 +2220,5 @@ sigs.k8s.io/structured-merge-diff/v4/value
22202220
## explicit; go 1.12
22212221
sigs.k8s.io/yaml
22222222
sigs.k8s.io/yaml/goyaml.v2
2223-
# sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20241105174925-ead1ef573704
2223+
# sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20250108094724-6eb6da5d6efd
22242224
# k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20241125210059-e3abfef0b992

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

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

0 commit comments

Comments
 (0)