Skip to content

Commit 3b54aa7

Browse files
committed
chore: rename driver tests
1 parent 770acc9 commit 3b54aa7

15 files changed

+34
-34
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ csi plugin name: `blob.csi.azure.com`
1313
### Container Images & Kubernetes Compatibility:
1414
|Azure Blob Storage CSI driver Version | Image | 1.14+ |
1515
|-----------------------------------------|----------------------------------------------------|--------|
16-
|master branch |mcr.microsoft.com/k8s/csi/blobfuse-csi:latest | yes |
16+
|master branch |mcr.microsoft.com/k8s/csi/blob-csi:latest | yes |
1717
|v0.6.0 |mcr.microsoft.com/k8s/csi/blobfuse-csi:v0.6.0 | yes |
1818
|v0.5.0 |mcr.microsoft.com/k8s/csi/blobfuse-csi:v0.5.0 | yes |
1919
|v0.4.0 |mcr.microsoft.com/k8s/csi/blobfuse-csi:v0.4.0 | yes |

deploy/example/deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
kind: PersistentVolumeClaim
33
apiVersion: v1
44
metadata:
5-
name: pvc-blobfuse
5+
name: pvc-blob
66
spec:
77
accessModes:
88
- ReadWriteOnce
@@ -42,7 +42,7 @@ spec:
4242
volumes:
4343
- name: blobfuse
4444
persistentVolumeClaim:
45-
claimName: pvc-blobfuse
45+
claimName: pvc-blob
4646
strategy:
4747
rollingUpdate:
4848
maxSurge: 0

deploy/example/e2e_usage.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ kubectl create secret generic azure-secret --from-literal azurestorageaccountnam
5353
apiVersion: v1
5454
kind: PersistentVolume
5555
metadata:
56-
name: pv-blobfuse
56+
name: pv-blob
5757
spec:
5858
capacity:
5959
storage: 10Gi
@@ -82,7 +82,7 @@ kubectl create -f https://raw.githubusercontent.com/kubernetes-sigs/blobfuse-csi
8282
#### 2. Validate PVC status and create an nginx pod
8383
> make sure pvc is created and in `Bound` status
8484
```console
85-
watch kubectl describe pvc pvc-blobfuse
85+
watch kubectl describe pvc pvc-blob
8686
```
8787

8888
- create a pod with blobfuse CSI PVC
@@ -93,8 +93,8 @@ kubectl create -f https://raw.githubusercontent.com/kubernetes-sigs/blobfuse-csi
9393
#### 3. enter the pod container to do validation
9494
- watch the status of pod until its Status changed from `Pending` to `Running` and then enter the pod container
9595
```console
96-
$ watch kubectl describe po nginx-blobfuse
97-
$ kubectl exec -it nginx-blobfuse -- bash
96+
$ watch kubectl describe po nginx-blob
97+
$ kubectl exec -it nginx-blob -- bash
9898
Filesystem Size Used Avail Use% Mounted on
9999
...
100100
blobfuse 30G 8.9G 21G 31% /mnt/blob

deploy/example/nginx-pod-blob.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22
kind: Pod
33
apiVersion: v1
44
metadata:
5-
name: nginx-blobfuse
5+
name: nginx-blob
66
spec:
77
containers:
88
- image: nginx
9-
name: nginx-blobfuse
9+
name: nginx-blob
1010
command:
1111
- "/bin/sh"
1212
- "-c"
1313
- while true; do echo $(date) >> /mnt/blob/outfile; sleep 1; done
1414
volumeMounts:
15-
- name: blobfuse01
15+
- name: blob01
1616
mountPath: "/mnt/blob"
1717
volumes:
18-
- name: blobfuse01
18+
- name: blob01
1919
persistentVolumeClaim:
20-
claimName: pvc-blobfuse
20+
claimName: pvc-blob

deploy/example/pv-blobfuse-csi-keyvault.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
kind: PersistentVolume
44
metadata:
5-
name: pv-blobfuse-keyvault
5+
name: pv-blob-keyvault
66
spec:
77
capacity:
88
storage: 10Gi

deploy/example/pv-blobfuse-csi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
kind: PersistentVolume
44
metadata:
5-
name: pv-blobfuse
5+
name: pv-blob
66
spec:
77
capacity:
88
storage: 10Gi

deploy/example/pvc-blob-csi-static.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
kind: PersistentVolumeClaim
33
apiVersion: v1
44
metadata:
5-
name: pvc-blobfuse
5+
name: pvc-blob
66
spec:
77
accessModes:
88
- ReadWriteMany
99
resources:
1010
requests:
1111
storage: 10Gi
12-
volumeName: pv-blobfuse
12+
volumeName: pv-blob
1313
storageClassName: ""

deploy/example/pvc-blob-csi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
apiVersion: v1
33
kind: PersistentVolumeClaim
44
metadata:
5-
name: pvc-blobfuse
5+
name: pvc-blob
66
spec:
77
accessModes:
88
- ReadWriteMany

pkg/blob/blob_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ func TestIsSASToken(t *testing.T) {
287287
}
288288

289289
func TestIsCorruptedDir(t *testing.T) {
290-
existingMountPath, err := ioutil.TempDir(os.TempDir(), "blobfuse-csi-mount-test")
290+
existingMountPath, err := ioutil.TempDir(os.TempDir(), "blob-csi-mount-test")
291291
if err != nil {
292292
t.Fatalf("failed to create tmp dir: %v", err)
293293
}

pkg/blob/controllerserver.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
170170
}, nil
171171
}
172172

173-
// DeleteVolume delete an blobfuse
173+
// DeleteVolume delete a volume
174174
func (d *Driver) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest) (*csi.DeleteVolumeResponse, error) {
175175
if len(req.GetVolumeId()) == 0 {
176176
return nil, status.Error(codes.InvalidArgument, "Volume ID missing in request")
@@ -260,7 +260,7 @@ func (d *Driver) ValidateVolumeCapabilities(ctx context.Context, req *csi.Valida
260260
return nil, status.Error(codes.NotFound, "the requested volume does not exist")
261261
}
262262

263-
// blobfuse supports all AccessModes, no need to check capabilities here
263+
// blob driver supports all AccessModes, no need to check capabilities here
264264
return &csi.ValidateVolumeCapabilitiesResponse{Message: ""}, nil
265265
}
266266

@@ -284,13 +284,13 @@ func (d *Driver) ListVolumes(ctx context.Context, req *csi.ListVolumesRequest) (
284284
}
285285

286286
// ControllerPublishVolume make a volume available on some required node
287-
// N/A for blobfuse
287+
// N/A for blob driver
288288
func (d *Driver) ControllerPublishVolume(ctx context.Context, req *csi.ControllerPublishVolumeRequest) (*csi.ControllerPublishVolumeResponse, error) {
289289
return nil, status.Error(codes.Unimplemented, "")
290290
}
291291

292292
// ControllerUnpublishVolume make the volume unavailable on a specified node
293-
// N/A for blobfuse
293+
// N/A for blob driver
294294
func (d *Driver) ControllerUnpublishVolume(ctx context.Context, req *csi.ControllerUnpublishVolumeRequest) (*csi.ControllerUnpublishVolumeResponse, error) {
295295
return nil, status.Error(codes.Unimplemented, "")
296296
}

0 commit comments

Comments
 (0)