Skip to content

Commit 770acc9

Browse files
andyzhangxandyzhangx
authored
Merge pull request #205 from andyzhangx/rename-test
chore: rename blobfuse test
2 parents c929135 + d974451 commit 770acc9

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Please refer to `blob.csi.azure.com` [driver parameters](./docs/driver-parameter
3131
- If cluster identity is [Managed Service Identity(MSI)](https://docs.microsoft.com/en-us/azure/aks/use-managed-identity), make sure user assigned identity has `Contributor` role on node resource group
3232
3333
### Install Azure Blob Storage CSI driver on a kubernetes cluster
34-
Please refer to [install Azure Blob Storage CSI driver](https://github.com/kubernetes-sigs/blobfuse-csi-driver/blob/master/docs/install-blobfuse-csi-driver.md)
34+
Please refer to [install Azure Blob Storage CSI driver](https://github.com/kubernetes-sigs/blobfuse-csi-driver/blob/master/docs/install-blob-csi-driver.md)
3535
3636
### Usage
3737
- [Basic usage](./deploy/example/e2e_usage.md)

‎docs/install-blobfuse-csi-driver.md renamed to ‎docs/install-blob-csi-driver.md

File renamed without changes.

‎docs/read-from-keyvault.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
```
2222

2323
## Install Azure Blob Storage CSI driver on a kubernetes cluster
24-
Please refer to [install Azure Blob Storage CSI driver](https://github.com/kubernetes-sigs/blobfuse-csi-driver/blob/master/docs/install-blobfuse-csi-driver.md)
24+
Please refer to [install Azure Blob Storage CSI driver](https://github.com/kubernetes-sigs/blobfuse-csi-driver/blob/master/docs/install-blob-csi-driver.md)
2525

2626
## Create PV
2727
1. Download a `pv-blobfuse-csi-keyvault.yaml`, edit `keyVaultURL`, `keyVaultSecretName`, `containerName` in PV

‎test/e2e/driver/blobfuse_csi_driver.go renamed to ‎test/e2e/driver/blob_csi_driver.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,24 @@ import (
2828
)
2929

3030
// Implement DynamicPVTestDriver interface
31-
type blobFuseCSIDriver struct {
31+
type blobCSIDriver struct {
3232
driverName string
3333
}
3434

35-
// InitBlobFuseCSIDriver returns blobFuseCSIDriver that implemnts DynamicPVTestDriver interface
36-
func InitBlobFuseCSIDriver() PVTestDriver {
37-
return &blobFuseCSIDriver{
35+
// InitBlobCSIDriver returns blobCSIDriver that implemnts DynamicPVTestDriver interface
36+
func InitBlobCSIDriver() PVTestDriver {
37+
return &blobCSIDriver{
3838
driverName: blob.DriverName,
3939
}
4040
}
4141

42-
func (d *blobFuseCSIDriver) GetDynamicProvisionStorageClass(parameters map[string]string, mountOptions []string, reclaimPolicy *v1.PersistentVolumeReclaimPolicy, bindingMode *storagev1.VolumeBindingMode, allowedTopologyValues []string, namespace string) *storagev1.StorageClass {
42+
func (d *blobCSIDriver) GetDynamicProvisionStorageClass(parameters map[string]string, mountOptions []string, reclaimPolicy *v1.PersistentVolumeReclaimPolicy, bindingMode *storagev1.VolumeBindingMode, allowedTopologyValues []string, namespace string) *storagev1.StorageClass {
4343
provisioner := d.driverName
4444
generateName := fmt.Sprintf("%s-%s-dynamic-sc-", namespace, provisioner)
4545
return getStorageClass(generateName, provisioner, parameters, mountOptions, reclaimPolicy, bindingMode, nil)
4646
}
4747

48-
func (d *blobFuseCSIDriver) GetPersistentVolume(volumeID string, fsType string, size string, reclaimPolicy *v1.PersistentVolumeReclaimPolicy, namespace string, attrib map[string]string, nodeStageSecretRef string) *v1.PersistentVolume {
48+
func (d *blobCSIDriver) GetPersistentVolume(volumeID string, fsType string, size string, reclaimPolicy *v1.PersistentVolumeReclaimPolicy, namespace string, attrib map[string]string, nodeStageSecretRef string) *v1.PersistentVolume {
4949
provisioner := d.driverName
5050
generateName := fmt.Sprintf("%s-%s-preprovsioned-pv-", namespace, provisioner)
5151
// Default to Retain ReclaimPolicy for pre-provisioned volumes
@@ -88,7 +88,7 @@ func (d *blobFuseCSIDriver) GetPersistentVolume(volumeID string, fsType string,
8888
}
8989
}
9090

91-
func (d *blobFuseCSIDriver) GetPreProvisionStorageClass(parameters map[string]string, mountOptions []string, reclaimPolicy *v1.PersistentVolumeReclaimPolicy, bindingMode *storagev1.VolumeBindingMode, allowedTopologyValues []string, namespace string) *storagev1.StorageClass {
91+
func (d *blobCSIDriver) GetPreProvisionStorageClass(parameters map[string]string, mountOptions []string, reclaimPolicy *v1.PersistentVolumeReclaimPolicy, bindingMode *storagev1.VolumeBindingMode, allowedTopologyValues []string, namespace string) *storagev1.StorageClass {
9292
provisioner := d.driverName
9393
generateName := fmt.Sprintf("%s-%s-pre-provisioned-sc-", namespace, provisioner)
9494
return getStorageClass(generateName, provisioner, parameters, mountOptions, reclaimPolicy, bindingMode, nil)

‎test/e2e/dynamic_provisioning_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var _ = ginkgo.Describe("[blobfuse-csi-e2e] Dynamic Provisioning", func() {
5050
ns = f.Namespace
5151
})
5252

53-
testDriver = driver.InitBlobFuseCSIDriver()
53+
testDriver = driver.InitBlobCSIDriver()
5454
ginkgo.It("should create a volume on demand", func() {
5555
pods := []testsuites.PodDetails{
5656
{

‎test/e2e/pre_provisioning_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ var _ = ginkgo.Describe("[blobfuse-csi-e2e] Pre-Provisioned", func() {
6262

6363
cs = f.ClientSet
6464
ns = f.Namespace
65-
testDriver = driver.InitBlobFuseCSIDriver()
65+
testDriver = driver.InitBlobCSIDriver()
6666
})
6767

6868
ginkgo.AfterEach(func() {
@@ -118,7 +118,7 @@ var _ = ginkgo.Describe("[blobfuse-csi-e2e] Pre-Provisioned", func() {
118118
ginkgo.Fail(fmt.Sprintf("create volume error: %v", err))
119119
}
120120
volumeID = resp.Volume.VolumeId
121-
ginkgo.By(fmt.Sprintf("Successfully provisioned BlobFuse volume: %q\n", volumeID))
121+
ginkgo.By(fmt.Sprintf("Successfully provisioned blob volume: %q\n", volumeID))
122122

123123
volumeSize := fmt.Sprintf("%dGi", defaultVolumeSize)
124124
reclaimPolicy := v1.PersistentVolumeReclaimRetain
@@ -144,7 +144,7 @@ var _ = ginkgo.Describe("[blobfuse-csi-e2e] Pre-Provisioned", func() {
144144
ginkgo.Fail(fmt.Sprintf("create volume error: %v", err))
145145
}
146146
volumeID = resp.Volume.VolumeId
147-
ginkgo.By(fmt.Sprintf("Successfully provisioned BlobFuse volume: %q\n", volumeID))
147+
ginkgo.By(fmt.Sprintf("Successfully provisioned blob volume: %q\n", volumeID))
148148

149149
volumeSize := fmt.Sprintf("%dGi", defaultVolumeSize)
150150
reclaimPolicy := v1.PersistentVolumeReclaimRetain
@@ -182,7 +182,7 @@ var _ = ginkgo.Describe("[blobfuse-csi-e2e] Pre-Provisioned", func() {
182182
ginkgo.Fail(fmt.Sprintf("create volume error: %v", err))
183183
}
184184
volumeID = resp.Volume.VolumeId
185-
ginkgo.By(fmt.Sprintf("Successfully provisioned BlobFuse volume: %q\n", volumeID))
185+
ginkgo.By(fmt.Sprintf("Successfully provisioned blob volume: %q\n", volumeID))
186186

187187
volumeSize := fmt.Sprintf("%dGi", defaultVolumeSize)
188188
reclaimPolicy := v1.PersistentVolumeReclaimRetain

0 commit comments

Comments
 (0)