Skip to content

Commit 1850a1e

Browse files
authored
Merge pull request #556 from andyzhangx/upgrade-k8s-1.28.4
chore: upgrade to k8s 1.28.4 lib
2 parents d84933d + 04b7f66 commit 1850a1e

File tree

2,204 files changed

+322663
-273150
lines changed

Some content is hidden

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

2,204 files changed

+322663
-273150
lines changed

go.mod

Lines changed: 66 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kubernetes-csi/csi-driver-nfs
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/container-storage-interface/spec v1.8.0
@@ -13,49 +13,55 @@ require (
1313
golang.org/x/net v0.18.0
1414
google.golang.org/grpc v1.59.0
1515
google.golang.org/protobuf v1.31.0
16-
k8s.io/api v0.26.11
17-
k8s.io/apimachinery v0.28.3
18-
k8s.io/client-go v0.26.11
16+
k8s.io/api v0.28.4
17+
k8s.io/apimachinery v0.28.4
18+
k8s.io/client-go v0.28.4
1919
k8s.io/klog/v2 v2.100.1
20-
k8s.io/kubernetes v1.26.11
21-
k8s.io/mount-utils v0.26.11
20+
k8s.io/kubernetes v1.28.4
21+
k8s.io/mount-utils v0.28.4
2222
k8s.io/pod-security-admission v0.0.0
23-
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
23+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
2424
sigs.k8s.io/yaml v1.4.0
2525
)
2626

2727
require (
28-
github.com/aws/aws-sdk-go v1.44.116 // indirect
28+
github.com/NYTimes/gziphandler v1.1.1 // indirect
29+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
30+
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
2931
github.com/beorn7/perks v1.0.1 // indirect
3032
github.com/blang/semver/v4 v4.0.0 // indirect
31-
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
33+
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
3234
github.com/cespare/xxhash/v2 v2.2.0 // indirect
35+
github.com/coreos/go-semver v0.3.1 // indirect
36+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3337
github.com/davecgh/go-spew v1.1.1 // indirect
34-
github.com/docker/distribution v2.8.1+incompatible // indirect
38+
github.com/docker/distribution v2.8.2+incompatible // indirect
3539
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
3640
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
3741
github.com/felixge/httpsnoop v1.0.3 // indirect
42+
github.com/fsnotify/fsnotify v1.6.0 // indirect
3843
github.com/go-logr/logr v1.3.0 // indirect
3944
github.com/go-logr/stdr v1.2.2 // indirect
40-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
41-
github.com/go-openapi/jsonreference v0.20.0 // indirect
42-
github.com/go-openapi/swag v0.19.14 // indirect
45+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
46+
github.com/go-openapi/jsonreference v0.20.2 // indirect
47+
github.com/go-openapi/swag v0.22.3 // indirect
4348
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
4449
github.com/gogo/protobuf v1.3.2 // indirect
4550
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
46-
github.com/google/gnostic v0.5.7-v3refs // indirect
51+
github.com/google/cel-go v0.16.1 // indirect
52+
github.com/google/gnostic-models v0.6.8 // indirect
4753
github.com/google/go-cmp v0.6.0 // indirect
48-
github.com/google/gofuzz v1.1.0 // indirect
54+
github.com/google/gofuzz v1.2.0 // indirect
4955
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
5056
github.com/google/uuid v1.3.1 // indirect
57+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
5158
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3 // indirect
5259
github.com/imdario/mergo v0.3.6 // indirect
53-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
54-
github.com/jmespath/go-jmespath v0.4.0 // indirect
60+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5561
github.com/josharian/intern v1.0.0 // indirect
5662
github.com/json-iterator/go v1.1.12 // indirect
57-
github.com/mailru/easyjson v0.7.6 // indirect
58-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
63+
github.com/mailru/easyjson v0.7.7 // indirect
64+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
5965
github.com/moby/spdystream v0.2.0 // indirect
6066
github.com/moby/sys/mountinfo v0.6.2 // indirect
6167
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -65,12 +71,17 @@ require (
6571
github.com/opencontainers/selinux v1.10.0 // indirect
6672
github.com/pkg/errors v0.9.1 // indirect
6773
github.com/pmezard/go-difflib v1.0.0 // indirect
68-
github.com/prometheus/client_golang v1.14.0 // indirect
69-
github.com/prometheus/client_model v0.3.0 // indirect
70-
github.com/prometheus/common v0.37.0 // indirect
71-
github.com/prometheus/procfs v0.8.0 // indirect
72-
github.com/spf13/cobra v1.6.0 // indirect
74+
github.com/prometheus/client_golang v1.16.0 // indirect
75+
github.com/prometheus/client_model v0.4.0 // indirect
76+
github.com/prometheus/common v0.44.0 // indirect
77+
github.com/prometheus/procfs v0.10.1 // indirect
78+
github.com/spf13/cobra v1.7.0 // indirect
7379
github.com/spf13/pflag v1.0.5 // indirect
80+
github.com/stoewer/go-strcase v1.2.0 // indirect
81+
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
82+
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
83+
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
84+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
7485
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
7586
go.opentelemetry.io/otel v1.10.0 // indirect
7687
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.10.0 // indirect
@@ -80,8 +91,13 @@ require (
8091
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
8192
go.opentelemetry.io/otel/trace v1.10.0 // indirect
8293
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
94+
go.uber.org/atomic v1.10.0 // indirect
95+
go.uber.org/multierr v1.11.0 // indirect
96+
go.uber.org/zap v1.19.0 // indirect
8397
golang.org/x/crypto v0.15.0 // indirect
98+
golang.org/x/exp v0.0.0-20220827204233-334a2380cb91 // indirect
8499
golang.org/x/oauth2 v0.13.0 // indirect
100+
golang.org/x/sync v0.4.0 // indirect
85101
golang.org/x/sys v0.14.0 // indirect
86102
golang.org/x/term v0.14.0 // indirect
87103
golang.org/x/text v0.14.0 // indirect
@@ -92,46 +108,38 @@ require (
92108
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
93109
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
94110
gopkg.in/inf.v0 v0.9.1 // indirect
111+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
95112
gopkg.in/yaml.v2 v2.4.0 // indirect
96113
gopkg.in/yaml.v3 v3.0.1 // indirect
97114
k8s.io/apiextensions-apiserver v0.0.0 // indirect
98-
k8s.io/apiserver v0.28.3 // indirect
99-
k8s.io/cloud-provider v0.26.11 // indirect
100-
k8s.io/component-base v0.26.11 // indirect
101-
k8s.io/component-helpers v0.26.11 // indirect
102-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
115+
k8s.io/apiserver v0.28.4 // indirect
116+
k8s.io/cloud-provider v0.28.4 // indirect
117+
k8s.io/component-base v0.28.4 // indirect
118+
k8s.io/component-helpers v0.28.4 // indirect
119+
k8s.io/controller-manager v0.28.4 // indirect
120+
k8s.io/kms v0.28.4 // indirect
121+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
103122
k8s.io/kubectl v0.0.0 // indirect
104-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.37 // indirect
105-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
123+
k8s.io/kubelet v0.0.0 // indirect
124+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
125+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
106126
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
107127
)
108128

109129
replace (
110-
k8s.io/api => k8s.io/api v0.26.11
111-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.11
112-
k8s.io/apimachinery => k8s.io/apimachinery v0.26.11
113-
k8s.io/apiserver => k8s.io/apiserver v0.26.11
114-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.11
115-
k8s.io/client-go => k8s.io/client-go v0.26.11
116-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.11
117-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.11
118-
k8s.io/code-generator => k8s.io/code-generator v0.26.11
119-
k8s.io/component-base => k8s.io/component-base v0.26.11
120-
k8s.io/component-helpers => k8s.io/component-helpers v0.26.11
121-
k8s.io/controller-manager => k8s.io/controller-manager v0.26.11
122-
k8s.io/cri-api => k8s.io/cri-api v0.26.11
123-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.11
124-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.11
125-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.11
126-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.11
127-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.11
128-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.11
129-
k8s.io/kubectl => k8s.io/kubectl v0.26.11
130-
k8s.io/kubelet => k8s.io/kubelet v0.26.11
131-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.11
132-
k8s.io/metrics => k8s.io/metrics v0.26.11
133-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.11
134-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.11
135-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.11
136-
k8s.io/sample-controller => k8s.io/sample-controller v0.26.11
130+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.4
131+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.4
132+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.4
133+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.4
134+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.4
135+
k8s.io/endpointslice => k8s.io/endpointslice v0.28.4
136+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.4
137+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.4
138+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.4
139+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.4
140+
k8s.io/kubectl => k8s.io/kubectl v0.28.4
141+
k8s.io/kubelet => k8s.io/kubelet v0.28.4
142+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.4
143+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.4
144+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.4
137145
)

0 commit comments

Comments
 (0)