Skip to content

Commit 621fb76

Browse files
committed
Bump openshift/api and kubernetes dependencies to latest v0.29.0
also had to bump and adjust kubernetes dpendencies. I've followed what Patryk did in 5b3123 : ``` go get github.com/openshift/api go get k8s.io/api go get k8s.io/code-generator go get k8s.io/component-base go get k8s.io/kube-proxy go get k8s.io/client-go go get k8s.io/apiextensions-apiserver go mod tidy go mod vendor ./hack/update-codegen.sh ``` also had to fix `make verify` error: ``` $ make verify Running `gofmt -s -l` on 120 file(s). go vet -mod=vendor ./... pkg/network/semver.go:28:2: k8s.io/klog/v2.Warningf format %v with arg v causes recursive (github.com/openshift/cluster-network-operator/pkg/network.versionChange).String method call make: *** [vendor/github.com/openshift/build-machinery-go/make/targets/golang/verify-update.mk:26: verify-govet] Error 1 ``` and then fix all the kubeproxyconfig tests because k8s object have new fields
1 parent 8bf8aa9 commit 621fb76

File tree

802 files changed

+49393
-23176
lines changed

Some content is hidden

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

802 files changed

+49393
-23176
lines changed

go.mod

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
github.com/containernetworking/cni v0.8.0
99
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
1010
github.com/go-bindata/go-bindata v3.1.2+incompatible
11-
github.com/onsi/gomega v1.27.7
11+
github.com/onsi/gomega v1.29.0
1212
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
1313
github.com/pkg/errors v0.9.1
1414
github.com/prometheus/client_golang v1.16.0
@@ -19,12 +19,12 @@ require (
1919
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
2020
golang.org/x/net v0.17.0
2121
gopkg.in/yaml.v2 v2.4.0 // indirect
22-
k8s.io/api v0.28.4
23-
k8s.io/apimachinery v0.28.4
24-
k8s.io/code-generator v0.28.4
25-
k8s.io/component-base v0.28.4
26-
k8s.io/klog/v2 v2.100.1
27-
k8s.io/kube-proxy v0.28.4
22+
k8s.io/api v0.29.0
23+
k8s.io/apimachinery v0.29.0
24+
k8s.io/code-generator v0.29.0
25+
k8s.io/component-base v0.29.0
26+
k8s.io/klog/v2 v2.110.1
27+
k8s.io/kube-proxy v0.29.0
2828
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
2929
sigs.k8s.io/controller-runtime v0.15.0
3030
)
@@ -40,15 +40,15 @@ require (
4040
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4141
github.com/evanphx/json-patch v5.6.0+incompatible // 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-openapi/jsonpointer v0.19.6 // indirect
4646
github.com/go-openapi/jsonreference v0.20.2 // indirect
4747
github.com/go-openapi/swag v0.22.3 // indirect
4848
github.com/gogo/protobuf v1.3.2 // indirect
4949
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5050
github.com/golang/protobuf v1.5.3 // indirect
51-
github.com/google/go-cmp v0.5.9 // indirect
51+
github.com/google/go-cmp v0.6.0 // indirect
5252
github.com/google/gofuzz v1.2.0 // indirect
5353
github.com/google/uuid v1.3.0 // indirect
5454
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
@@ -71,52 +71,52 @@ require (
7171
github.com/prometheus/procfs v0.10.1 // indirect
7272
github.com/robfig/cron v1.2.0 // indirect
7373
github.com/sirupsen/logrus v1.9.3 // indirect
74-
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
75-
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
76-
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
77-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.39.0 // indirect
78-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.39.0 // indirect
79-
go.opentelemetry.io/otel v1.13.0 // indirect
80-
go.opentelemetry.io/otel/metric v0.36.0 // indirect
81-
go.opentelemetry.io/otel/sdk v1.13.0 // indirect
82-
go.opentelemetry.io/otel/trace v1.13.0 // indirect
83-
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
74+
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
75+
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
76+
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
77+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
78+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
79+
go.opentelemetry.io/otel v1.19.0 // indirect
80+
go.opentelemetry.io/otel/metric v1.19.0 // indirect
81+
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
82+
go.opentelemetry.io/otel/trace v1.19.0 // indirect
83+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
8484
go.uber.org/atomic v1.11.0 // indirect
8585
go.uber.org/multierr v1.11.0 // indirect
8686
go.uber.org/zap v1.24.0 // indirect
8787
golang.org/x/crypto v0.14.0 // indirect
88-
golang.org/x/mod v0.10.0 // indirect
89-
golang.org/x/oauth2 v0.8.0 // indirect
90-
golang.org/x/sync v0.2.0 // indirect
88+
golang.org/x/mod v0.12.0 // indirect
89+
golang.org/x/oauth2 v0.10.0 // indirect
90+
golang.org/x/sync v0.3.0 // indirect
9191
golang.org/x/sys v0.13.0 // indirect
9292
golang.org/x/term v0.13.0 // indirect
9393
golang.org/x/text v0.13.0 // indirect
9494
golang.org/x/time v0.3.0 // indirect
95-
golang.org/x/tools v0.9.3 // indirect
95+
golang.org/x/tools v0.12.0 // indirect
9696
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
9797
google.golang.org/appengine v1.6.7 // indirect
98-
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
99-
google.golang.org/grpc v1.56.3 // indirect
98+
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
99+
google.golang.org/grpc v1.58.3 // indirect
100100
google.golang.org/protobuf v1.31.0 // indirect
101101
gopkg.in/inf.v0 v0.9.1 // indirect
102102
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
103103
gopkg.in/yaml.v3 v3.0.1 // indirect
104-
k8s.io/gengo v0.0.0-20221011193443-fad74ee6edd9 // indirect
105-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
106-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
104+
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
105+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
106+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
107107
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
108108
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
109-
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
109+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
110110
sigs.k8s.io/yaml v1.3.0 // indirect
111111
)
112112

113113
require (
114-
github.com/openshift/api v0.0.0-20231205121914-b5716b30456a
114+
github.com/openshift/api v0.0.0-20240108220607-355cd2586ec4
115115
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1
116116
github.com/openshift/library-go v0.0.0-20231123173213-a037480d443b
117117
github.com/openshift/machine-config-operator v0.0.1-0.20231002195040-a2469941c0dc
118-
k8s.io/apiextensions-apiserver v0.28.4
119-
k8s.io/client-go v0.28.4
118+
k8s.io/apiextensions-apiserver v0.29.0
119+
k8s.io/client-go v0.29.0
120120
)
121121

122122
require (
@@ -134,26 +134,25 @@ require (
134134
github.com/coreos/ignition v0.35.0 // indirect
135135
github.com/coreos/ignition/v2 v2.15.0 // indirect
136136
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 // indirect
137-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
137+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
138138
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
139139
github.com/go-logr/stdr v1.2.2 // indirect
140140
github.com/google/btree v1.1.2 // indirect
141-
github.com/google/cel-go v0.16.1 // indirect
141+
github.com/google/cel-go v0.17.7 // indirect
142142
github.com/google/gnostic-models v0.6.8 // indirect
143-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.15.0 // indirect
143+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
144144
github.com/onsi/ginkgo v1.16.5 // indirect
145145
github.com/shopspring/decimal v1.3.1 // indirect
146146
github.com/spf13/cast v1.5.1 // indirect
147147
github.com/stoewer/go-strcase v1.3.0 // indirect
148148
github.com/vincent-petithory/dataurl v1.0.0 // indirect
149-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.13.0 // indirect
150-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.13.0 // indirect
151-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.13.0 // indirect
149+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
150+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
152151
go4.org v0.0.0-20201209231011-d4a079459e60 // indirect
153152
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
154-
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
155-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
156-
k8s.io/apiserver v0.28.4 // indirect
157-
k8s.io/kms v0.28.4 // indirect
153+
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
154+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
155+
k8s.io/apiserver v0.29.0 // indirect
156+
k8s.io/kms v0.29.0 // indirect
158157
k8s.io/kube-aggregator v0.28.2 // indirect
159158
)

0 commit comments

Comments
 (0)