Skip to content

Commit 7f31189

Browse files
andyzhangxk8s-infra-cherrypick-robot
authored andcommitted
chore: update CSI spec to v1.10.0
chore: upgrade to CSI spec v1.10.0
1 parent 3aa8602 commit 7f31189

File tree

8 files changed

+8460
-4448
lines changed

8 files changed

+8460
-4448
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ require (
1313
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets v1.2.0
1414
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.2
1515
github.com/Azure/go-autorest/autorest v0.11.29
16-
github.com/container-storage-interface/spec v1.9.0
16+
github.com/container-storage-interface/spec v1.10.0
1717
github.com/go-ini/ini v1.67.0
1818
github.com/golang/protobuf v1.5.4
1919
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK3
8484
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
8585
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
8686
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
87-
github.com/container-storage-interface/spec v1.9.0 h1:zKtX4STsq31Knz3gciCYCi1SXtO2HJDecIjDVboYavY=
88-
github.com/container-storage-interface/spec v1.9.0/go.mod h1:ZfDu+3ZRyeVqxZM0Ds19MVLkN2d1XJ5MAfi1L3VjlT0=
87+
github.com/container-storage-interface/spec v1.10.0 h1:YkzWPV39x+ZMTa6Ax2czJLLwpryrQ+dPesB34mrRMXA=
88+
github.com/container-storage-interface/spec v1.10.0/go.mod h1:DtUvaQszPml1YJfIK7c00mlv6/g4wNMLanLgiUbKFRI=
8989
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
9090
github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
9191
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=

pkg/blob/blob.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,11 @@ func (option *DriverOptions) AddFlags() {
213213
// Driver implements all interfaces of CSI drivers
214214
type Driver struct {
215215
csicommon.CSIDriver
216+
// Embed UnimplementedXXXServer to ensure the driver returns Unimplemented for any
217+
// new RPC methods that might be introduced in future versions of the spec.
218+
csi.UnimplementedControllerServer
219+
csi.UnimplementedIdentityServer
220+
csi.UnimplementedNodeServer
216221

217222
cloud *azure.Cloud
218223
clientFactory azclient.ClientFactory

pkg/blob/identityserver_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ func TestProbe(t *testing.T) {
5656
resp, err := d.Probe(context.Background(), &req)
5757
assert.NoError(t, err)
5858
assert.NotNil(t, resp)
59-
assert.Equal(t, resp.XXX_sizecache, int32(0))
6059
assert.Equal(t, resp.Ready.Value, true)
6160
}
6261

@@ -66,5 +65,4 @@ func TestGetPluginCapabilities(t *testing.T) {
6665
resp, err := d.GetPluginCapabilities(context.Background(), &req)
6766
assert.NoError(t, err)
6867
assert.NotNil(t, resp)
69-
assert.Equal(t, resp.XXX_sizecache, int32(0))
7068
}

pkg/csi-common/utils_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ func TestLogGRPC(t *testing.T) {
108108
"account_name": "k8s",
109109
"account_key": "testkey",
110110
},
111-
XXX_sizecache: 100,
112111
},
113112
`GRPC request: {"secrets":"***stripped***","volume_id":"vol_1"}`,
114113
},
@@ -126,7 +125,6 @@ func TestLogGRPC(t *testing.T) {
126125
"csi.storage.k8s.io/serviceAccount.tokens": "testtoken",
127126
"csi.storage.k8s.io/testfield": "testvalue",
128127
},
129-
XXX_sizecache: 100,
130128
},
131129
`GRPC request: {"volume_context":{"csi.storage.k8s.io/serviceAccount.tokens":"***stripped***","csi.storage.k8s.io/testfield":"testvalue"}}`,
132130
},
@@ -137,7 +135,6 @@ func TestLogGRPC(t *testing.T) {
137135
"csi.storage.k8s.io/serviceAccount.tokens": "testtoken",
138136
"csi.storage.k8s.io/testfield": "testvalue",
139137
},
140-
XXX_sizecache: 100,
141138
},
142139
`GRPC request: {"volume_context":{"csi.storage.k8s.io/serviceAccount.tokens":"***stripped***","csi.storage.k8s.io/testfield":"testvalue"}}`,
143140
},
@@ -153,7 +150,6 @@ func TestLogGRPC(t *testing.T) {
153150
"csi.storage.k8s.io/serviceAccount.tokens": "testtoken",
154151
"csi.storage.k8s.io/testfield": "testvalue",
155152
},
156-
XXX_sizecache: 100,
157153
},
158154
`GRPC request: {"secrets":"***stripped***","volume_context":{"csi.storage.k8s.io/serviceAccount.tokens":"***stripped***","csi.storage.k8s.io/testfield":"testvalue"},"volume_id":"vol_1"}`,
159155
},
@@ -202,7 +198,6 @@ func TestNewControllerServiceCapability(t *testing.T) {
202198
for _, test := range tests {
203199
resp := NewControllerServiceCapability(test.cap)
204200
assert.NotNil(t, resp)
205-
assert.Equal(t, resp.XXX_sizecache, int32(0))
206201
}
207202
}
208203

@@ -226,7 +221,6 @@ func TestNewNodeServiceCapability(t *testing.T) {
226221
for _, test := range tests {
227222
resp := NewNodeServiceCapability(test.cap)
228223
assert.NotNil(t, resp)
229-
assert.Equal(t, resp.XXX_sizecache, int32(0))
230224
}
231225
}
232226

0 commit comments

Comments
 (0)