Skip to content

Commit ab8cf34

Browse files
authored
Update deps to Knative 1.16 (#3375)
* Update deps to Knative 1.16 * Refactor codegen to new scripts * Migrate to new API contracts * Bump controller-runtime to latest * Cleanup old todo and add OCP pin * Regen make generated-file * Fix linter error * Update func and kn images * Refactor generated openshift/client-go to new structure * Fix plural form of DNS resource * Formatting touch ups * Add comment about plural forms
1 parent 280a980 commit ab8cf34

File tree

1,159 files changed

+79576
-31902
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,159 files changed

+79576
-31902
lines changed

go.mod

Lines changed: 32 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ require (
2929
k8s.io/client-go v0.31.0
3030
knative.dev/eventing v0.44.0
3131
knative.dev/eventing-kafka-broker v0.37.0
32-
knative.dev/hack v0.0.0-20240814130635-06f7aff93954
33-
knative.dev/networking v0.0.0-20240716111826-bab7f2a3e556
34-
knative.dev/operator v0.42.5
35-
knative.dev/pkg v0.0.0-20240716082220-4355f0c73608
36-
knative.dev/serving v0.42.1
32+
knative.dev/hack v0.0.0-20250117112405-6cb0feb3ac46
33+
knative.dev/networking v0.0.0-20241022012959-60e29ff520dc
34+
knative.dev/operator v0.43.1
35+
knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad
36+
knative.dev/serving v0.43.1
3737
sigs.k8s.io/controller-runtime v0.19.0
3838
sigs.k8s.io/yaml v1.4.0
3939
)
@@ -50,13 +50,14 @@ require (
5050
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
5151
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5252
github.com/opencontainers/go-digest v1.0.0 // indirect
53-
github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
53+
github.com/rs/dnscache v0.0.0-20230804202142-fc85eb664529 // indirect
5454
github.com/valyala/bytebufferpool v1.0.0 // indirect
5555
go.opentelemetry.io/otel v1.30.0 // indirect
5656
go.opentelemetry.io/otel/trace v1.30.0 // indirect
57-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
57+
golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect
5858
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
5959
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
60+
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
6061
)
6162

6263
require (
@@ -83,7 +84,7 @@ require (
8384
github.com/go-openapi/jsonpointer v0.21.0 // indirect
8485
github.com/go-openapi/jsonreference v0.21.0 // indirect
8586
github.com/go-openapi/swag v0.23.0 // indirect
86-
github.com/gobuffalo/flect v1.0.2 // indirect
87+
github.com/gobuffalo/flect v1.0.3 // indirect
8788
github.com/gogo/googleapis v1.4.1 // indirect
8889
github.com/gogo/protobuf v1.3.2 // indirect
8990
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -92,7 +93,7 @@ require (
9293
github.com/google/go-containerregistry v0.17.0 // indirect
9394
github.com/google/gofuzz v1.2.0 // indirect
9495
github.com/google/uuid v1.6.0
95-
github.com/gorilla/websocket v1.5.1 // indirect
96+
github.com/gorilla/websocket v1.5.3 // indirect
9697
github.com/hashicorp/errwrap v1.1.0 // indirect
9798
github.com/hashicorp/go-multierror v1.1.1 // indirect
9899
github.com/hashicorp/go-uuid v1.0.3 // indirect
@@ -129,7 +130,7 @@ require (
129130
github.com/rickb777/plural v1.2.2 // indirect
130131
github.com/robfig/cron/v3 v3.0.1 // indirect
131132
github.com/sirupsen/logrus v1.9.3 // indirect
132-
github.com/tsenart/vegeta/v12 v12.11.1 // indirect
133+
github.com/tsenart/vegeta/v12 v12.12.0 // indirect
133134
github.com/wavesoftware/go-ensure v1.0.0 // indirect
134135
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
135136
github.com/xdg-go/scram v1.1.2 // indirect
@@ -148,20 +149,19 @@ require (
148149
golang.org/x/tools v0.26.0 // indirect
149150
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
150151
google.golang.org/api v0.183.0 // indirect
151-
google.golang.org/protobuf v1.34.2 // indirect
152+
google.golang.org/protobuf v1.35.1 // indirect
152153
gopkg.in/inf.v0 v0.9.1 // indirect
153154
gopkg.in/yaml.v2 v2.4.0 // indirect
154155
gopkg.in/yaml.v3 v3.0.1
155156
istio.io/api v0.0.0-20231206023236-e7cadb36da57 // indirect
156157
istio.io/client-go v1.18.7 // indirect
157158
k8s.io/apiserver v0.31.0 // indirect
158-
k8s.io/code-generator v0.29.9 // indirect
159-
k8s.io/component-base v0.31.0 // indirect
160-
k8s.io/gengo v0.0.0-20240129211411-f967bbeff4b4 // indirect
159+
k8s.io/code-generator v0.30.9 // indirect
160+
k8s.io/gengo v0.0.0-20240404160639-a0386bf69313 // indirect
161161
k8s.io/klog/v2 v2.130.1 // indirect
162162
k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 // indirect
163163
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
164-
knative.dev/caching v0.0.0-20240716132144-989f54c83776 // indirect
164+
knative.dev/caching v0.0.0-20241022012359-41bbaf964d16 // indirect
165165
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
166166
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
167167
)
@@ -170,40 +170,33 @@ require (
170170
github.com/go-logr/logr v1.4.2
171171
go.uber.org/atomic v1.11.0 // indirect
172172
k8s.io/apiextensions-apiserver v0.31.0
173-
knative.dev/reconciler-test v0.0.0-20240927070509-8fa68bab4e6e
173+
knative.dev/reconciler-test v0.0.0-20241015093232-09111f0f1364
174174
)
175175

176176
replace (
177177
// Knative components
178-
knative.dev/eventing => github.com/openshift-knative/eventing v0.99.1-0.20250128093204-0c1358afb757
179-
knative.dev/eventing-kafka-broker => github.com/openshift-knative/eventing-kafka-broker v0.25.1-0.20240917152412-5dd3c57c9356
180-
knative.dev/hack => knative.dev/hack v0.0.0-20240814135050-f9643117f6a1
181-
knative.dev/networking => knative.dev/networking v0.0.0-20240716111826-bab7f2a3e556
182-
knative.dev/pkg => knative.dev/pkg v0.0.0-20240716082220-4355f0c73608
183-
knative.dev/reconciler-test => knative.dev/reconciler-test v0.0.0-20240716134925-00d94f40c470
184-
knative.dev/serving => github.com/openshift-knative/serving v0.10.1-0.20240906121033-618992fcbd27
178+
knative.dev/eventing => github.com/openshift-knative/eventing v0.99.1-0.20250206151234-8ddd84c72db1
179+
knative.dev/eventing-kafka-broker => github.com/openshift-knative/eventing-kafka-broker v0.25.1-0.20250206122622-bdc0c9bbf746
180+
knative.dev/hack => knative.dev/hack v0.0.0-20250117112405-6cb0feb3ac46
181+
knative.dev/networking => knative.dev/networking v0.0.0-20241022012959-60e29ff520dc
182+
knative.dev/pkg => knative.dev/pkg v0.0.0-20241021183759-9b9d535af5ad
183+
knative.dev/reconciler-test => knative.dev/reconciler-test v0.0.0-20241015093232-09111f0f1364
184+
knative.dev/serving => github.com/openshift-knative/serving v0.10.1-0.20250207125854-cf4e630711c9
185185
)
186186

187187
replace (
188188
// OpenShift components
189-
github.com/openshift/api => github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094
190-
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20240510131258-f646d5f29250
189+
github.com/openshift/api => github.com/openshift/api v0.0.0-20240912201240-0a8800162826
190+
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20240528061634-b054aa794d87
191191
)
192192

193193
replace (
194194
// Kubernetes components
195-
// TODO: we should update to Kubernetes 1.30 in the S-O release 1.36
196-
// https://issues.redhat.com/browse/SRVCOM-3384
197-
k8s.io/api => k8s.io/api v0.29.9
198-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.9
199-
k8s.io/apimachinery => k8s.io/apimachinery v0.29.9
200-
k8s.io/client-go => k8s.io/client-go v0.29.9
201-
k8s.io/code-generator => k8s.io/code-generator v0.29.9
202-
k8s.io/component-base => k8s.io/component-base v0.29.9
203-
// This replacement can be removed once we bump to [email protected], as from release 1.30+
204-
// https://github.com/kubernetes/code-generator/blob/release-1.30/go.mod, code-generator will use
205-
// the new v2 version of kube-openapi.
206-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
207-
k8s.io/utils => k8s.io/utils v0.0.0-20240310230437-4693a0247e57
208-
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.17.6
195+
k8s.io/api => k8s.io/api v0.30.9
196+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.9
197+
k8s.io/apimachinery => k8s.io/apimachinery v0.30.9
198+
k8s.io/client-go => k8s.io/client-go v0.30.9
199+
k8s.io/code-generator => k8s.io/code-generator v0.30.9
200+
k8s.io/component-base => k8s.io/component-base v0.30.9
201+
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.18.7
209202
)

0 commit comments

Comments
 (0)