Skip to content

Commit 60f5b16

Browse files
authored
Merge pull request #477 from sunnylovestiramisu/module-update-master
Update dependency go modules for k8s v1.29.0-rc.1
2 parents 4ac5b74 + 2f00a6d commit 60f5b16

File tree

37 files changed

+11091
-599
lines changed

37 files changed

+11091
-599
lines changed

go.mod

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
module github.com/kubernetes-csi/csi-driver-host-path
22

3-
go 1.20
3+
go 1.21
44

55
require (
6-
github.com/container-storage-interface/spec v1.8.0
6+
github.com/container-storage-interface/spec v1.9.0
77
github.com/golang/glog v1.2.0
88
github.com/golang/protobuf v1.5.3
99
github.com/kubernetes-csi/csi-lib-utils v0.16.0
1010
github.com/pborman/uuid v1.2.1
1111
github.com/stretchr/testify v1.8.4
1212
golang.org/x/net v0.19.0
1313
google.golang.org/grpc v1.59.0
14-
k8s.io/apimachinery v0.28.2
14+
k8s.io/apimachinery v0.29.0-rc.1
1515
k8s.io/klog/v2 v2.110.1
16-
k8s.io/kubernetes v1.28.2
17-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
16+
k8s.io/kubernetes v1.29.0-rc.1
17+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
1818
)
1919

2020
require (
@@ -39,65 +39,66 @@ require (
3939
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
4040
google.golang.org/protobuf v1.31.0 // indirect
4141
gopkg.in/inf.v0 v0.9.1 // indirect
42+
gopkg.in/yaml.v2 v2.4.0 // indirect
4243
gopkg.in/yaml.v3 v3.0.1 // indirect
4344
k8s.io/apiextensions-apiserver v0.28.2 // indirect
44-
k8s.io/apiserver v0.28.2 // indirect
45-
k8s.io/component-base v0.28.2 // indirect
45+
k8s.io/apiserver v0.29.0-rc.1 // indirect
46+
k8s.io/component-base v0.29.0-rc.1 // indirect
4647
k8s.io/mount-utils v0.28.2 // indirect
4748
)
4849

49-
replace k8s.io/api => k8s.io/api v0.28.2
50+
replace k8s.io/api => k8s.io/api v0.29.0-rc.1
5051

51-
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.2
52+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.0-rc.1
5253

53-
replace k8s.io/apimachinery => k8s.io/apimachinery v0.28.2
54+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.29.0-rc.1
5455

55-
replace k8s.io/apiserver => k8s.io/apiserver v0.28.2
56+
replace k8s.io/apiserver => k8s.io/apiserver v0.29.0-rc.1
5657

57-
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.2
58+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.0-rc.1
5859

59-
replace k8s.io/client-go => k8s.io/client-go v0.28.2
60+
replace k8s.io/client-go => k8s.io/client-go v0.29.0-rc.1
6061

61-
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.2
62+
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.0-rc.1
6263

63-
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.2
64+
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.0-rc.1
6465

65-
replace k8s.io/code-generator => k8s.io/code-generator v0.28.2
66+
replace k8s.io/code-generator => k8s.io/code-generator v0.29.0-rc.1
6667

67-
replace k8s.io/component-base => k8s.io/component-base v0.28.2
68+
replace k8s.io/component-base => k8s.io/component-base v0.29.0-rc.1
6869

69-
replace k8s.io/component-helpers => k8s.io/component-helpers v0.28.2
70+
replace k8s.io/component-helpers => k8s.io/component-helpers v0.29.0-rc.1
7071

71-
replace k8s.io/controller-manager => k8s.io/controller-manager v0.28.2
72+
replace k8s.io/controller-manager => k8s.io/controller-manager v0.29.0-rc.1
7273

73-
replace k8s.io/cri-api => k8s.io/cri-api v0.28.2
74+
replace k8s.io/cri-api => k8s.io/cri-api v0.29.0-rc.1
7475

75-
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.2
76+
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.0-rc.1
7677

77-
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.2
78+
replace k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.0-rc.1
7879

79-
replace k8s.io/kms => k8s.io/kms v0.28.2
80+
replace k8s.io/kms => k8s.io/kms v0.29.0-rc.1
8081

81-
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.2
82+
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.0-rc.1
8283

83-
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.2
84+
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.0-rc.1
8485

85-
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.2
86+
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.0-rc.1
8687

87-
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.2
88+
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.0-rc.1
8889

89-
replace k8s.io/kubectl => k8s.io/kubectl v0.28.2
90+
replace k8s.io/kubectl => k8s.io/kubectl v0.29.0-rc.1
9091

91-
replace k8s.io/kubelet => k8s.io/kubelet v0.28.2
92+
replace k8s.io/kubelet => k8s.io/kubelet v0.29.0-rc.1
9293

93-
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.2
94+
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.0-rc.1
9495

95-
replace k8s.io/metrics => k8s.io/metrics v0.28.2
96+
replace k8s.io/metrics => k8s.io/metrics v0.29.0-rc.1
9697

97-
replace k8s.io/mount-utils => k8s.io/mount-utils v0.28.2
98+
replace k8s.io/mount-utils => k8s.io/mount-utils v0.30.0-alpha.0
9899

99-
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.2
100+
replace k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.0-rc.1
100101

101-
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.2
102+
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.0-rc.1
102103

103-
replace k8s.io/endpointslice => k8s.io/endpointslice v0.28.2
104+
replace k8s.io/endpointslice => k8s.io/endpointslice v0.29.0-rc.1

go.sum

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM
44
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
55
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
66
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
7-
github.com/container-storage-interface/spec v1.8.0 h1:D0vhF3PLIZwlwZEf2eNbpujGCNwspwTYf2idJRJx4xI=
8-
github.com/container-storage-interface/spec v1.8.0/go.mod h1:ROLik+GhPslwwWRNFF1KasPzroNARibH2rfz1rkg4H0=
7+
github.com/container-storage-interface/spec v1.9.0 h1:zKtX4STsq31Knz3gciCYCi1SXtO2HJDecIjDVboYavY=
8+
github.com/container-storage-interface/spec v1.9.0/go.mod h1:ZfDu+3ZRyeVqxZM0Ds19MVLkN2d1XJ5MAfi1L3VjlT0=
99
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
1010
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
1111
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -21,13 +21,16 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
2121
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
2222
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
2323
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
24+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
2425
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
26+
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
2527
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
2628
github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
2729
github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
2830
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
2931
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
3032
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
33+
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
3134
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
3235
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
3336
github.com/kubernetes-csi/csi-lib-utils v0.16.0 h1:LXCvkhXHtFOkl7LoDqFdho/MuebccZqWxLwhKiRGiBg=
@@ -49,6 +52,7 @@ github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO
4952
github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg=
5053
github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM=
5154
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
55+
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
5256
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
5357
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
5458
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
@@ -98,23 +102,26 @@ google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs
98102
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
99103
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
100104
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
105+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
101106
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
102107
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
108+
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
109+
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
103110
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
104111
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
105-
k8s.io/apiextensions-apiserver v0.28.2 h1:J6/QRWIKV2/HwBhHRVITMLYoypCoPY1ftigDM0Kn+QU=
106-
k8s.io/apiextensions-apiserver v0.28.2/go.mod h1:5tnkxLGa9nefefYzWuAlWZ7RZYuN/765Au8cWLA6SRg=
107-
k8s.io/apimachinery v0.28.2 h1:KCOJLrc6gu+wV1BYgwik4AF4vXOlVJPdiqn0yAWWwXQ=
108-
k8s.io/apimachinery v0.28.2/go.mod h1:RdzF87y/ngqk9H4z3EL2Rppv5jj95vGS/HaFXrLDApU=
109-
k8s.io/apiserver v0.28.2 h1:rBeYkLvF94Nku9XfXyUIirsVzCzJBs6jMn3NWeHieyI=
110-
k8s.io/apiserver v0.28.2/go.mod h1:f7D5e8wH8MWcKD7azq6Csw9UN+CjdtXIVQUyUhrtb+E=
111-
k8s.io/component-base v0.28.2 h1:Yc1yU+6AQSlpJZyvehm/NkJBII72rzlEsd6MkBQ+G0E=
112-
k8s.io/component-base v0.28.2/go.mod h1:4IuQPQviQCg3du4si8GpMrhAIegxpsgPngPRR/zWpzc=
112+
k8s.io/apiextensions-apiserver v0.29.0-rc.1 h1:qS9G1R2bSGifRx4WM6aI36V7Xs5kIJ1aOdjnU+Q7euc=
113+
k8s.io/apiextensions-apiserver v0.29.0-rc.1/go.mod h1:tnV28e3fqQJ2cV6U02qxpcQRcdJHadWn92GjS1U7004=
114+
k8s.io/apimachinery v0.29.0-rc.1 h1:ReoN5k+8AEn2sj8//kcWsPbCH0dmY0Axy34XNJz7CsA=
115+
k8s.io/apimachinery v0.29.0-rc.1/go.mod h1:eVBxQ/cwiJxH58eK/jd/vAk4mrxmVlnpBH5J2GbMeis=
116+
k8s.io/apiserver v0.29.0-rc.1 h1:5w+V5PxqZTCnk43Io9wiODMHCJvujPbrBNfvZxvrnbc=
117+
k8s.io/apiserver v0.29.0-rc.1/go.mod h1:m+p0MCsTaH6s+lH6yC+zyzTFV6pKmJpfWogbj05CSI8=
118+
k8s.io/component-base v0.29.0-rc.1 h1:YNXLyyB7x0lGqclAXmUbREnRiESVFPJrX0Nqz0+XHKw=
119+
k8s.io/component-base v0.29.0-rc.1/go.mod h1:BxIwavzsdJarfgTSRgaQa7IbepGVNdFSiEsLGUaH4QA=
113120
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
114121
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
115-
k8s.io/kubernetes v1.28.2 h1:GhcnYeNTukeaC0dD5BC+UWBvzQsFEpWj7XBVMQptfYc=
116-
k8s.io/kubernetes v1.28.2/go.mod h1:FmB1Mlp9ua0ezuwQCTGs/y6wj/fVisN2sVxhzjj0WDk=
117-
k8s.io/mount-utils v0.28.2 h1:sIdMH7fRhcU48V1oYJ9cLmLm/TG+2jLhhe8eS3I+FWg=
118-
k8s.io/mount-utils v0.28.2/go.mod h1:AyP8LmZSLgpGdFQr+vzHTerlPiGvXUdP99n98Er47jw=
119-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
120-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
122+
k8s.io/kubernetes v1.29.0-rc.1 h1:oqPgJ5yyawfiMzjDhCvzwFtTIcaGF57ntsN50xzl5oI=
123+
k8s.io/kubernetes v1.29.0-rc.1/go.mod h1:9kztbUQf9stVDcIYXx+BX3nuGCsAQDsuClkGMpPs3pA=
124+
k8s.io/mount-utils v0.30.0-alpha.0 h1:hga3HePjAnYTofEKHmjvTZZzSCTV4auLQ9D172n1Gig=
125+
k8s.io/mount-utils v0.30.0-alpha.0/go.mod h1:N3lDK/G1B8R/IkAt4NhHyqB07OqEr7P763z3TNge94U=
126+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
127+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=

pkg/hostpath/controllerserver.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,10 @@ func (hp *hostPath) ControllerGetVolume(ctx context.Context, req *csi.Controller
493493
}, nil
494494
}
495495

496+
func (hp *hostPath) ControllerModifyVolume(ctx context.Context, request *csi.ControllerModifyVolumeRequest) (*csi.ControllerModifyVolumeResponse, error) {
497+
return nil, fmt.Errorf("unimplemented")
498+
}
499+
496500
// CreateSnapshot uses tar command to create snapshot for hostpath volume. The tar command can quickly create
497501
// archives of entire directories. The host image must have "tar" binaries in /bin, /usr/sbin, or /usr/bin.
498502
func (hp *hostPath) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshotRequest) (*csi.CreateSnapshotResponse, error) {

0 commit comments

Comments
 (0)