Skip to content

Commit d216fc3

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #776 from humblec/kube-v1.25
update kube dependencies to v1.25.0 release
2 parents 9aa9392 + eabcf05 commit d216fc3

File tree

431 files changed

+19282
-6472
lines changed

Some content is hidden

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

431 files changed

+19282
-6472
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ The [design document](./doc/design.md) explains this in more detail.
138138
### Topology support
139139
When `Topology` feature is enabled and the driver specifies `VOLUME_ACCESSIBILITY_CONSTRAINTS` in its plugin capabilities, external-provisioner prepares `CreateVolumeRequest.AccessibilityRequirements` while calling `Controller.CreateVolume`. The driver has to consider these topology constraints while creating the volume. Below table shows how these `AccessibilityRequirements` are prepared:
140140

141-
[Delayed binding](https://kubernetes.io/docs/concepts/storage/storage-classes/#volume-binding-mode) | Strict topology | [Allowed topologies](https://kubernetes.io/docs/concepts/storage/storage-classes/#allowed-topologies) | Immediate Topology | [Resulting accessability requirements](https://github.com/container-storage-interface/spec/blob/master/spec.md#createvolume)
141+
[Delayed binding](https://kubernetes.io/docs/concepts/storage/storage-classes/#volume-binding-mode) | Strict topology | [Allowed topologies](https://kubernetes.io/docs/concepts/storage/storage-classes/#allowed-topologies) | Immediate Topology | [Resulting accessibility requirements](https://github.com/container-storage-interface/spec/blob/master/spec.md#createvolume)
142142
:---: |:---:|:---:|:---:|:---|
143143
Yes | Yes | Irrelevant | Irrelevant | `Requisite` = `Preferred` = Selected node topology
144144
Yes | No | No | Irrelevant | `Requisite` = Aggregated cluster topology<br>`Preferred` = `Requisite` with selected node topology as first element

‎go.mod‎

Lines changed: 45 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/kubernetes-csi/external-provisioner
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/container-storage-interface/spec v1.6.0
@@ -17,13 +17,13 @@ require (
1717
github.com/stretchr/testify v1.8.0
1818
google.golang.org/grpc v1.49.0
1919
google.golang.org/protobuf v1.28.1
20-
k8s.io/api v0.24.2
21-
k8s.io/apimachinery v0.24.2
22-
k8s.io/apiserver v0.24.0
23-
k8s.io/client-go v0.24.2
24-
k8s.io/component-base v0.24.2
25-
k8s.io/component-helpers v0.24.0-beta.0
26-
k8s.io/csi-translation-lib v0.23.5
20+
k8s.io/api v0.25.0
21+
k8s.io/apimachinery v0.25.0
22+
k8s.io/apiserver v0.25.0
23+
k8s.io/client-go v0.25.0
24+
k8s.io/component-base v0.25.0
25+
k8s.io/component-helpers v0.25.0
26+
k8s.io/csi-translation-lib v0.25.0
2727
k8s.io/klog/v2 v2.70.1
2828
sigs.k8s.io/controller-runtime v0.12.3
2929
sigs.k8s.io/sig-storage-lib-external-provisioner/v8 v8.0.0
@@ -36,7 +36,7 @@ require (
3636
github.com/blang/semver/v4 v4.0.0 // indirect
3737
github.com/cespare/xxhash/v2 v2.1.2 // indirect
3838
github.com/davecgh/go-spew v1.1.1 // indirect
39-
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
39+
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
4040
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4141
github.com/go-logr/logr v1.2.3 // indirect
4242
github.com/go-openapi/jsonpointer v0.19.5 // indirect
@@ -61,78 +61,77 @@ require (
6161
github.com/prometheus/common v0.37.0 // indirect
6262
github.com/prometheus/procfs v0.8.0 // indirect
6363
github.com/spf13/cobra v1.4.0 // indirect
64-
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
65-
golang.org/x/net v0.0.0-20220403103023-749bd193bc2b // indirect
64+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
65+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
6666
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
67-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
67+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
6868
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
6969
golang.org/x/text v0.3.7 // indirect
7070
golang.org/x/time v0.0.0-20220224211638-0e9765cccd65 // indirect
71-
golang.org/x/tools v0.1.10 // indirect
72-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
71+
golang.org/x/tools v0.1.12 // indirect
7372
google.golang.org/appengine v1.6.7 // indirect
74-
google.golang.org/genproto v0.0.0-20220405205423-9d709892a2bf // indirect
73+
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
7574
gopkg.in/inf.v0 v0.9.1 // indirect
7675
gopkg.in/yaml.v2 v2.4.0 // indirect
7776
gopkg.in/yaml.v3 v3.0.1 // indirect
7877
k8s.io/klog v1.0.0 // indirect
79-
k8s.io/kube-openapi v0.0.0-20220401212409-b28bf2818661 // indirect
80-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
81-
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
82-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
78+
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
79+
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
80+
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
81+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
8382
sigs.k8s.io/yaml v1.3.0 // indirect
8483
)
8584

86-
replace k8s.io/api => k8s.io/api v0.24.0
85+
replace k8s.io/api => k8s.io/api v0.25.0
8786

88-
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.24.0
87+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.0
8988

90-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.24.0
89+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.25.0
9190

92-
replace k8s.io/apiserver => k8s.io/apiserver v0.24.0
91+
replace k8s.io/apiserver => k8s.io/apiserver v0.25.0
9392

94-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.24.0
93+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.25.0
9594

96-
replace k8s.io/client-go => k8s.io/client-go v0.24.0
95+
replace k8s.io/client-go => k8s.io/client-go v0.25.0
9796

98-
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.0
97+
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.0
9998

100-
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.0
99+
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.0
101100

102-
replace k8s.io/code-generator => k8s.io/code-generator v0.24.0
101+
replace k8s.io/code-generator => k8s.io/code-generator v0.25.0
103102

104-
replace k8s.io/component-base => k8s.io/component-base v0.24.0
103+
replace k8s.io/component-base => k8s.io/component-base v0.25.0
105104

106-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.24.0
105+
replace k8s.io/component-helpers => k8s.io/component-helpers v0.25.0
107106

108-
replace k8s.io/controller-manager => k8s.io/controller-manager v0.24.0
107+
replace k8s.io/controller-manager => k8s.io/controller-manager v0.25.0
109108

110-
replace k8s.io/cri-api => k8s.io/cri-api v0.24.0
109+
replace k8s.io/cri-api => k8s.io/cri-api v0.25.0
111110

112-
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.24.0
111+
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.0
113112

114-
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.24.0
113+
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.0
115114

116-
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.24.0
115+
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.0
117116

118-
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.24.0
117+
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.0
119118

120-
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.24.0
119+
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.0
121120

122-
replace k8s.io/kubectl => k8s.io/kubectl v0.24.0
121+
replace k8s.io/kubectl => k8s.io/kubectl v0.25.0
123122

124-
replace k8s.io/kubelet => k8s.io/kubelet v0.24.0
123+
replace k8s.io/kubelet => k8s.io/kubelet v0.25.0
125124

126-
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.24.0
125+
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.25.0
127126

128-
replace k8s.io/metrics => k8s.io/metrics v0.24.0
127+
replace k8s.io/metrics => k8s.io/metrics v0.25.0
129128

130-
replace k8s.io/mount-utils => k8s.io/mount-utils v0.24.0
129+
replace k8s.io/mount-utils => k8s.io/mount-utils v0.25.0
131130

132-
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.24.0
131+
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.25.0
133132

134-
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.24.0
133+
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.25.0
135134

136-
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.24.0
135+
replace k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.25.0
137136

138-
replace k8s.io/sample-controller => k8s.io/sample-controller v0.24.0
137+
replace k8s.io/sample-controller => k8s.io/sample-controller v0.25.0

0 commit comments

Comments
 (0)