Skip to content

Commit b79d763

Browse files
metlosmetlos
committed
downgrade controller-runtime back to 0.21.0.
The 0.22.x causes different kinds of problems with SSA in the fake client that are not worth upgrading to.
1 parent 237e681 commit b79d763

2 files changed

Lines changed: 35 additions & 2 deletions

File tree

‎go.mod‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,36 @@ toolchain go1.24.13
66

77
require (
88
github.com/go-bindata/go-bindata v3.1.2+incompatible
9-
// using latest commit from 'github.com/openshift/api branch release-4.20'
9+
// using latest commit from 'github.com/openshift/api branch release-4.21'
1010
github.com/openshift/api v0.0.0-20260304172252-b0658d22beea
1111
k8s.io/api v0.34.1
1212
k8s.io/apimachinery v0.34.1
1313
k8s.io/code-generator v0.34.1
1414
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01
1515
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
16-
sigs.k8s.io/controller-runtime v0.22.1
16+
sigs.k8s.io/controller-runtime v0.21.0
1717
sigs.k8s.io/controller-tools v0.19.0
1818
)
1919

2020
require (
21+
github.com/beorn7/perks v1.0.1 // indirect
22+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
23+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2124
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
25+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2226
github.com/fatih/color v1.18.0 // indirect
27+
github.com/fsnotify/fsnotify v1.9.0 // indirect
2328
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
2429
github.com/go-logr/logr v1.4.3 // indirect
2530
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2631
github.com/go-openapi/jsonreference v0.20.2 // indirect
2732
github.com/go-openapi/swag v0.23.0 // indirect
2833
github.com/gobuffalo/flect v1.0.3 // indirect
2934
github.com/gogo/protobuf v1.3.2 // indirect
35+
github.com/google/btree v1.1.3 // indirect
3036
github.com/google/gnostic-models v0.7.0 // indirect
37+
github.com/google/go-cmp v0.7.0 // indirect
38+
github.com/google/uuid v1.6.0 // indirect
3139
github.com/inconshreveable/mousetrap v1.1.0 // indirect
3240
github.com/josharian/intern v1.0.0 // indirect
3341
github.com/json-iterator/go v1.1.12 // indirect
@@ -36,22 +44,35 @@ require (
3644
github.com/mattn/go-isatty v0.0.20 // indirect
3745
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3846
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
47+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
48+
github.com/pkg/errors v0.9.1 // indirect
49+
github.com/pmezard/go-difflib v1.0.0 // indirect
50+
github.com/prometheus/client_golang v1.22.0 // indirect
51+
github.com/prometheus/client_model v0.6.1 // indirect
52+
github.com/prometheus/common v0.62.0 // indirect
53+
github.com/prometheus/procfs v0.15.1 // indirect
3954
github.com/spf13/cobra v1.9.1 // indirect
4055
github.com/spf13/pflag v1.0.7 // indirect
4156
github.com/x448/float16 v0.8.4 // indirect
4257
go.yaml.in/yaml/v2 v2.4.2 // indirect
4358
go.yaml.in/yaml/v3 v3.0.4 // indirect
4459
golang.org/x/mod v0.27.0 // indirect
4560
golang.org/x/net v0.43.0 // indirect
61+
golang.org/x/oauth2 v0.27.0 // indirect
4662
golang.org/x/sync v0.16.0 // indirect
4763
golang.org/x/sys v0.35.0 // indirect
64+
golang.org/x/term v0.34.0 // indirect
4865
golang.org/x/text v0.28.0 // indirect
66+
golang.org/x/time v0.9.0 // indirect
4967
golang.org/x/tools v0.36.0 // indirect
68+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
5069
google.golang.org/protobuf v1.36.7 // indirect
70+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
5171
gopkg.in/inf.v0 v0.9.1 // indirect
5272
gopkg.in/yaml.v2 v2.4.0 // indirect
5373
gopkg.in/yaml.v3 v3.0.1 // indirect
5474
k8s.io/apiextensions-apiserver v0.34.1 // indirect
75+
k8s.io/client-go v0.34.1 // indirect
5576
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
5677
k8s.io/klog/v2 v2.130.1 // indirect
5778
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect

‎go.sum‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
1818
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1919
github.com/emicklei/go-restful/v3 v3.12.2 h1:DhwDP0vY3k8ZzE0RunuJy8GhNpPL6zqLkDf9B/a0/xU=
2020
github.com/emicklei/go-restful/v3 v3.12.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
21+
github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU=
22+
github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM=
2123
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
2224
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
2325
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
@@ -47,6 +49,8 @@ github.com/gobuffalo/flect v1.0.3 h1:xeWBM2nui+qnVvNM4S3foBhCAL2XgPU+a7FdpelbTq4
4749
github.com/gobuffalo/flect v1.0.3/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs=
4850
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
4951
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
52+
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
53+
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
5054
github.com/google/cel-go v0.26.0 h1:DPGjXackMpJWH680oGY4lZhYjIameYmR+/6RBdDGmaI=
5155
github.com/google/cel-go v0.26.0/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM=
5256
github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
@@ -103,6 +107,8 @@ github.com/onsi/gomega v1.38.1 h1:FaLA8GlcpXDwsb7m0h2A9ew2aTk3vnZMlzFgg5tz/pk=
103107
github.com/onsi/gomega v1.38.1/go.mod h1:LfcV8wZLvwcYRwPiJysphKAEsmcFnLMK/9c+PjvlX8g=
104108
github.com/openshift/api v0.0.0-20260304172252-b0658d22beea h1:cakCJUhTaFEf67R5PARXWsgZAFSY0OkpIb0Sxo71gkM=
105109
github.com/openshift/api v0.0.0-20260304172252-b0658d22beea/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
110+
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
111+
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
106112
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
107113
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
108114
github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
@@ -211,6 +217,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
211217
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
212218
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
213219
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
220+
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
221+
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
214222
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb h1:p31xT4yrYrSM/G4Sn2+TNUkVhFCbG9y8itM2S6Th950=
215223
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb/go.mod h1:jbe3Bkdp+Dh2IrslsFCklNhweNTBgSYanP1UXhJDhKg=
216224
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb h1:TLPQVbx1GJ8VKZxz52VAxl1EBgKXXbTiU9Fc5fZeLn4=
@@ -223,6 +231,8 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
223231
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
224232
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
225233
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
234+
gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=
235+
gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
226236
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
227237
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
228238
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
@@ -260,6 +270,8 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
260270
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
261271
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
262272
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
273+
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
274+
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
263275
sigs.k8s.io/controller-runtime v0.22.1 h1:Ah1T7I+0A7ize291nJZdS1CabF/lB4E++WizgV24Eqg=
264276
sigs.k8s.io/controller-runtime v0.22.1/go.mod h1:FwiwRjkRPbiN+zp2QRp7wlTCzbUXxZ/D4OzuQUDwBHY=
265277
sigs.k8s.io/controller-tools v0.19.0 h1:OU7jrPPiZusryu6YK0jYSjPqg8Vhf8cAzluP9XGI5uk=

0 commit comments

Comments
 (0)