Merge pull request #598 from fuxiuyin/master

k8s-ci-robot · web-flow · commit 61228334ac97 · 2022-01-06T03:22:29.000-08:00
fix the Confirmed field of ValidateVolumeCapabilities response
diff --git a/pkg/blob/controllerserver.go b/pkg/blob/controllerserver.go
@@ -413,7 +413,12 @@ func (d *Driver) ValidateVolumeCapabilities(ctx context.Context, req *csi.Valida
 	}
 
 	// blob driver supports all AccessModes, no need to check capabilities here
-	return &csi.ValidateVolumeCapabilitiesResponse{Message: ""}, nil
+	return &csi.ValidateVolumeCapabilitiesResponse{
+		Confirmed: &csi.ValidateVolumeCapabilitiesResponse_Confirmed{
+			VolumeCapabilities: req.GetVolumeCapabilities(),
+		},
+		Message: "",
+	}, nil
 }
 
 // ControllerGetCapabilities returns the capabilities of the Controller plugin

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,12 @@ func (d Driver) ValidateVolumeCapabilities(ctx context.Context, req csi.Valida`
`413`	`413`	`}`
`414`	`414`
`415`	`415`	`// blob driver supports all AccessModes, no need to check capabilities here`
`416`		`- return &csi.ValidateVolumeCapabilitiesResponse{Message: ""}, nil`
	`416`	`+ return &csi.ValidateVolumeCapabilitiesResponse{`
	`417`	`+ Confirmed: &csi.ValidateVolumeCapabilitiesResponse_Confirmed{`
	`418`	`+ VolumeCapabilities: req.GetVolumeCapabilities(),`
	`419`	`+ },`
	`420`	`+ Message: "",`
	`421`	`+ }, nil`
`417`	`422`	`}`
`418`	`423`
`419`	`424`	`// ControllerGetCapabilities returns the capabilities of the Controller plugin`