Merge pull request #517 from andyzhangx/ReadWriteOncePod-cap2

feat: add ReadWriteOncePod cap
kubernetes-sigs · Sep 22, 2021 · 11f4ebe · 11f4ebe
2 parents ad9bb8f + dd6f13c
commit 11f4ebe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -108,7 +108,7 @@ blob-darwin:
 
 .PHONY: container
 container: blob
-	docker build -t $(IMAGE_TAG) -f ./pkg/blobplugin/dev.Dockerfile .
+	docker build -t $(IMAGE_TAG) --output=type=docker -f ./pkg/blobplugin/dev.Dockerfile .
 
 .PHONY: container-linux
 container-linux:

diff --git a/pkg/blob/blob.go b/pkg/blob/blob.go
@@ -188,6 +188,7 @@ func (d *Driver) Run(endpoint, kubeconfig string, testBool bool) {
 			//csi.ControllerServiceCapability_RPC_CREATE_DELETE_SNAPSHOT,
 			//csi.ControllerServiceCapability_RPC_LIST_SNAPSHOTS,
 			csi.ControllerServiceCapability_RPC_EXPAND_VOLUME,
+			csi.ControllerServiceCapability_RPC_SINGLE_NODE_MULTI_WRITER,
 		})
 	d.AddVolumeCapabilityAccessModes([]csi.VolumeCapability_AccessMode_Mode{
 		csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
@@ -202,7 +203,7 @@ func (d *Driver) Run(endpoint, kubeconfig string, testBool bool) {
 	d.AddNodeServiceCapabilities([]csi.NodeServiceCapability_RPC_Type{
 		csi.NodeServiceCapability_RPC_STAGE_UNSTAGE_VOLUME,
 		csi.NodeServiceCapability_RPC_GET_VOLUME_STATS,
-		csi.NodeServiceCapability_RPC_UNKNOWN,
+		csi.NodeServiceCapability_RPC_SINGLE_NODE_MULTI_WRITER,
 	})
 
 	s := csicommon.NewNonBlockingGRPCServer()

diff --git a/test/sanity/run-test.sh b/test/sanity/run-test.sh
@@ -37,4 +37,4 @@ _output/blobplugin --endpoint "$nodeendpoint" --nodeid "$nodeid" --enable-blob-m
 
 echo "Begin to run sanity test..."
 readonly CSI_SANITY_BIN='csi-sanity'
-"$CSI_SANITY_BIN" --ginkgo.v --csi.endpoint=$nodeendpoint --csi.controllerendpoint=$controllerendpoint -ginkgo.skip="should fail when requesting to create a volume with already existing name and different capacity|should be idempotent"
+"$CSI_SANITY_BIN" --ginkgo.v --csi.endpoint=$nodeendpoint --csi.controllerendpoint=$controllerendpoint -ginkgo.skip="should fail when requesting to create a volume with already existing name and different capacity|should be idempotent|should return appropriate capabilities"