Skip to content

Commit a492b7f

Browse files
authored
Merge pull request #712 from xing-yang/backport_703
Backport 703: update kube dependencies to v1.24.0 release
2 parents db21674 + fca3f88 commit a492b7f

File tree

828 files changed

+68273
-16190
lines changed

Some content is hidden

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

828 files changed

+68273
-16190
lines changed

go.mod

Lines changed: 61 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -6,96 +6,102 @@ require (
66
github.com/container-storage-interface/spec v1.5.0
77
github.com/evanphx/json-patch v4.12.0+incompatible
88
github.com/fsnotify/fsnotify v1.4.9
9-
github.com/golang/mock v1.5.0
9+
github.com/golang/mock v1.6.0
1010
github.com/golang/protobuf v1.5.2
1111
github.com/google/gofuzz v1.2.0
12-
github.com/kubernetes-csi/csi-lib-utils v0.10.0
12+
github.com/kubernetes-csi/csi-lib-utils v0.11.0
1313
github.com/kubernetes-csi/csi-test/v4 v4.0.2
1414
github.com/kubernetes-csi/external-snapshotter/client/v6 v6.0.0
15-
github.com/prometheus/client_golang v1.11.1
15+
github.com/prometheus/client_golang v1.12.1
1616
github.com/prometheus/client_model v0.2.0
17-
github.com/prometheus/common v0.28.0
18-
github.com/spf13/cobra v1.2.1
17+
github.com/prometheus/common v0.32.1
18+
github.com/spf13/cobra v1.4.0
1919
google.golang.org/grpc v1.40.0
20-
k8s.io/api v0.23.0
21-
k8s.io/apimachinery v0.23.0
22-
k8s.io/client-go v0.23.0
23-
k8s.io/component-base v0.23.0
24-
k8s.io/component-helpers v0.23.0
25-
k8s.io/klog/v2 v2.30.0
20+
k8s.io/api v0.24.0
21+
k8s.io/apimachinery v0.24.0
22+
k8s.io/client-go v0.24.0
23+
k8s.io/component-base v0.24.0
24+
k8s.io/component-helpers v0.24.0
25+
k8s.io/klog/v2 v2.60.1
2626
k8s.io/kubernetes v1.23.0
2727
)
2828

2929
require (
30+
github.com/PuerkitoBio/purell v1.1.1 // indirect
31+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
3032
github.com/beorn7/perks v1.0.1 // indirect
31-
github.com/blang/semver v3.5.1+incompatible // indirect
32-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
33+
github.com/blang/semver/v4 v4.0.0 // indirect
34+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3335
github.com/davecgh/go-spew v1.1.1 // indirect
36+
github.com/emicklei/go-restful v2.9.5+incompatible // indirect
3437
github.com/go-logr/logr v1.2.0 // indirect
38+
github.com/go-openapi/jsonpointer v0.19.5 // indirect
39+
github.com/go-openapi/jsonreference v0.19.5 // indirect
40+
github.com/go-openapi/swag v0.19.14 // indirect
3541
github.com/gogo/protobuf v1.3.2 // indirect
3642
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
43+
github.com/google/gnostic v0.5.7-v3refs // indirect
3744
github.com/google/go-cmp v0.5.6 // indirect
38-
github.com/googleapis/gnostic v0.5.5 // indirect
3945
github.com/imdario/mergo v0.3.11 // indirect
4046
github.com/inconshreveable/mousetrap v1.0.0 // indirect
47+
github.com/josharian/intern v1.0.0 // indirect
4148
github.com/json-iterator/go v1.1.12 // indirect
49+
github.com/mailru/easyjson v0.7.6 // indirect
4250
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
4351
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4452
github.com/modern-go/reflect2 v1.0.2 // indirect
53+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4554
github.com/nxadm/tail v1.4.8 // indirect
4655
github.com/pkg/errors v0.9.1 // indirect
47-
github.com/prometheus/procfs v0.6.0 // indirect
56+
github.com/prometheus/procfs v0.7.3 // indirect
4857
github.com/spf13/pflag v1.0.5 // indirect
49-
golang.org/x/net v0.0.0-20210825183410-e898025ed96a // indirect
50-
golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
51-
golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e // indirect
52-
golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b // indirect
58+
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
59+
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
60+
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
61+
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
5362
golang.org/x/text v0.3.7 // indirect
54-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
63+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
5564
google.golang.org/appengine v1.6.7 // indirect
56-
google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2 // indirect
65+
google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
5766
google.golang.org/protobuf v1.27.1 // indirect
5867
gopkg.in/inf.v0 v0.9.1 // indirect
5968
gopkg.in/yaml.v2 v2.4.0 // indirect
6069
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
6170
k8s.io/klog v1.0.0 // indirect
62-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
63-
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
64-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
65-
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
71+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
72+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
73+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
74+
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
6675
sigs.k8s.io/yaml v1.3.0 // indirect
6776
)
6877

6978
replace (
7079
github.com/kubernetes-csi/external-snapshotter/client/v6 => ./client
71-
k8s.io/api => k8s.io/api v0.23.0
72-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.0
73-
k8s.io/apimachinery => k8s.io/apimachinery v0.23.0
74-
k8s.io/apiserver => k8s.io/apiserver v0.23.0
75-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.0
76-
k8s.io/client-go => k8s.io/client-go v0.23.0
77-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.0
78-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.0
79-
k8s.io/code-generator => k8s.io/code-generator v0.23.0
80-
k8s.io/component-base => k8s.io/component-base v0.23.0
81-
k8s.io/component-helpers => k8s.io/component-helpers v0.23.0
82-
k8s.io/controller-manager => k8s.io/controller-manager v0.23.0
83-
k8s.io/cri-api => k8s.io/cri-api v0.23.0
84-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.0
85-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.0
86-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.0
87-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.0
88-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.0
89-
k8s.io/kubectl => k8s.io/kubectl v0.23.0
90-
k8s.io/kubelet => k8s.io/kubelet v0.23.0
91-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.0
92-
k8s.io/metrics => k8s.io/metrics v0.23.0
93-
k8s.io/mount-utils => k8s.io/mount-utils v0.23.0
94-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.0
80+
k8s.io/api => k8s.io/api v0.24.0
81+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.0
82+
k8s.io/apimachinery => k8s.io/apimachinery v0.24.0
83+
k8s.io/apiserver => k8s.io/apiserver v0.24.0
84+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.0
85+
k8s.io/client-go => k8s.io/client-go v0.24.0
86+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.0
87+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.0
88+
k8s.io/code-generator => k8s.io/code-generator v0.24.0
89+
k8s.io/component-base => k8s.io/component-base v0.24.0
90+
k8s.io/component-helpers => k8s.io/component-helpers v0.24.0
91+
k8s.io/controller-manager => k8s.io/controller-manager v0.24.0
92+
k8s.io/cri-api => k8s.io/cri-api v0.24.0
93+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.0
94+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.0
95+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.0
96+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.0
97+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.0
98+
k8s.io/kubectl => k8s.io/kubectl v0.24.0
99+
k8s.io/kubelet => k8s.io/kubelet v0.24.0
100+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.0
101+
k8s.io/metrics => k8s.io/metrics v0.24.0
102+
k8s.io/mount-utils => k8s.io/mount-utils v0.24.0
103+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.0
104+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.0
105+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.0
106+
k8s.io/sample-controller => k8s.io/sample-controller v0.24.0
95107
)
96-
97-
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.0
98-
99-
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.23.0
100-
101-
replace k8s.io/sample-controller => k8s.io/sample-controller v0.23.0

0 commit comments

Comments
 (0)