Skip to content

Commit d57437b

Browse files
author
Per Goncalves da Silva
committed
Fix up go.mod
Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent 0f05b9d commit d57437b

File tree

468 files changed

+16621
-35402
lines changed

Some content is hidden

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

468 files changed

+16621
-35402
lines changed

go.mod

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -183,24 +183,11 @@ require (
183183
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect
184184
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
185185
sigs.k8s.io/randfill v1.0.0 // indirect
186-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
187186
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
188187
sigs.k8s.io/yaml v1.6.0 // indirect
189188
)
190189

191-
// v1.64.0 brings in go1.23, which we aren't ready to go to just yet
192-
// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/3284
193-
replace google.golang.org/grpc => google.golang.org/grpc v1.63.2
194-
195-
// cel-go v0.23.0 upgrade causes errors raised from the vendor source which lead to think in
196-
// incompatibilities scenarios. After upgrade to use the latest versions of k8s/api v0.33+
197-
// we should try to see if we could fix this one and remove this replace
198-
replace github.com/google/cel-go => github.com/google/cel-go v0.22.1
199-
200-
replace (
201-
// controller runtime
202-
github.com/openshift/api => github.com/openshift/api v0.0.0-20221021112143-4226c2167e40 // release-4.12
203-
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c // release-4.12
204-
)
190+
// controller runtime
191+
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20221021112143-4226c2167e40 // release-4.12
205192

206193
retract v3.11.0+incompatible // https://github.com/operator-framework/operator-lifecycle-manager/issues/2253

go.sum

Lines changed: 178 additions & 2014 deletions
Large diffs are not rendered by default.

vendor/github.com/google/cel-go/cel/BUILD.bazel

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

vendor/github.com/google/cel-go/cel/decls.go

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

0 commit comments

Comments
 (0)