Skip to content

Commit 40b366d

Browse files
committed
OCPBUGS-25484: Bump library-go to deal with GET conflict
1 parent 020349b commit 40b366d

File tree

803 files changed

+51899
-22104
lines changed

Some content is hidden

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

803 files changed

+51899
-22104
lines changed

go.mod

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ require (
99
github.com/go-bindata/go-bindata v3.1.2+incompatible
1010
github.com/go-test/deep v1.0.5
1111
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
12-
github.com/openshift/api v0.0.0-20231128131348-2eef5be42ab4
12+
github.com/openshift/api v0.0.0-20231218131639-7a5aa77cc72d
1313
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
14-
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1
15-
github.com/openshift/library-go v0.0.0-20230927113136-405c34317fa4
14+
github.com/openshift/client-go v0.0.0-20231218140158-47f6d749b9d9
15+
github.com/openshift/library-go v0.0.0-20240115112243-470c096a1ca9
1616
github.com/spf13/cobra v1.7.0
1717
gopkg.in/yaml.v2 v2.4.0
18-
k8s.io/api v0.28.3
19-
k8s.io/apiextensions-apiserver v0.28.3
20-
k8s.io/apimachinery v0.28.3
21-
k8s.io/client-go v0.28.3
22-
k8s.io/component-base v0.28.3
23-
k8s.io/klog/v2 v2.100.1
18+
k8s.io/api v0.29.0
19+
k8s.io/apiextensions-apiserver v0.29.0
20+
k8s.io/apimachinery v0.29.0
21+
k8s.io/client-go v0.29.0
22+
k8s.io/component-base v0.29.0
23+
k8s.io/klog/v2 v2.110.1
2424
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
2525
open-cluster-management.io/cluster-proxy v0.2.3-0.20221207094012-1632287bcfa3
2626
sigs.k8s.io/controller-runtime v0.16.3
@@ -40,18 +40,18 @@ require (
4040
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4141
github.com/felixge/fgprof v0.9.3 // indirect
4242
github.com/felixge/httpsnoop v1.0.3 // indirect
43-
github.com/fsnotify/fsnotify v1.6.0 // indirect
44-
github.com/go-logr/logr v1.2.4 // indirect
43+
github.com/fsnotify/fsnotify v1.7.0 // indirect
44+
github.com/go-logr/logr v1.3.0 // indirect
4545
github.com/go-logr/stdr v1.2.2 // indirect
4646
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4747
github.com/go-openapi/jsonreference v0.20.2 // indirect
4848
github.com/go-openapi/swag v0.22.4 // indirect
4949
github.com/gogo/protobuf v1.3.2 // indirect
5050
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5151
github.com/golang/protobuf v1.5.3 // indirect
52-
github.com/google/cel-go v0.16.1 // indirect
52+
github.com/google/cel-go v0.17.7 // indirect
5353
github.com/google/gnostic-models v0.6.8 // indirect
54-
github.com/google/go-cmp v0.5.9 // indirect
54+
github.com/google/go-cmp v0.6.0 // indirect
5555
github.com/google/gofuzz v1.2.0 // indirect
5656
github.com/google/pprof v0.0.0-20230705174524-200ffdc848b8 // indirect
5757
github.com/google/uuid v1.3.0 // indirect
@@ -75,19 +75,17 @@ require (
7575
github.com/sirupsen/logrus v1.9.3 // indirect
7676
github.com/spf13/pflag v1.0.5 // indirect
7777
github.com/stoewer/go-strcase v1.3.0 // indirect
78-
github.com/stretchr/testify v1.8.4 // indirect
79-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
80-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
81-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
78+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
79+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
80+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
8281
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
83-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
84-
go.opentelemetry.io/otel v1.16.0 // indirect
85-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
86-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
87-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect
88-
go.opentelemetry.io/otel/metric v1.16.0 // indirect
89-
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
90-
go.opentelemetry.io/otel/trace v1.16.0 // indirect
82+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
83+
go.opentelemetry.io/otel v1.19.0 // indirect
84+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
85+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
86+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
87+
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
88+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
9189
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
9290
go.uber.org/multierr v1.11.0 // indirect
9391
go.uber.org/zap v1.25.0 // indirect
@@ -101,21 +99,21 @@ require (
10199
golang.org/x/text v0.13.0 // indirect
102100
golang.org/x/time v0.3.0 // indirect
103101
google.golang.org/appengine v1.6.7 // indirect
104-
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
105-
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
106-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
107-
google.golang.org/grpc v1.56.2 // indirect
102+
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
103+
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
104+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
105+
google.golang.org/grpc v1.58.3 // indirect
108106
google.golang.org/protobuf v1.31.0 // indirect
109107
gopkg.in/inf.v0 v0.9.1 // indirect
110108
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
111109
gopkg.in/yaml.v3 v3.0.1 // indirect
112-
k8s.io/apiserver v0.28.3 // indirect
113-
k8s.io/kms v0.28.3 // indirect
114-
k8s.io/kube-aggregator v0.28.2 // indirect
115-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
116-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.3 // indirect
110+
k8s.io/apiserver v0.29.0 // indirect
111+
k8s.io/kms v0.29.0 // indirect
112+
k8s.io/kube-aggregator v0.29.0 // indirect
113+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
114+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
117115
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
118116
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
119-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
117+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
120118
sigs.k8s.io/yaml v1.3.0 // indirect
121119
)

0 commit comments

Comments
 (0)