Skip to content

Commit 94a0519

Browse files
authored
Merge pull request #816 from andyzhangx/refine-doc
doc: refine doc
2 parents 8dcb723 + 3515467 commit 94a0519

6 files changed

+31
-21
lines changed

deploy/example/e2e_usage.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -82,19 +82,21 @@ kubectl create secret generic azure-secret --from-literal azurestorageaccountnam
8282
apiVersion: v1
8383
kind: PersistentVolume
8484
metadata:
85+
annotations:
86+
pv.kubernetes.io/provisioned-by: blob.csi.azure.com
8587
name: pv-blob
8688
spec:
8789
capacity:
8890
storage: 10Gi
8991
accessModes:
9092
- ReadWriteMany
91-
persistentVolumeReclaimPolicy: Retain # "Delete" is not supported in static provisioning
93+
persistentVolumeReclaimPolicy: Retain
9294
csi:
9395
driver: blob.csi.azure.com
9496
readOnly: false
95-
# make sure volumeid is unique for every identical storage blob container in the cluster
96-
# character `#` is reserved for internal use and cannot be used in volumehandle
97-
volumeHandle: unique-volumeid
97+
# make sure volumeid is unique for every storage blob container in the cluster
98+
# the # character is reserved for internal use
99+
volumeHandle: account-name_container-name
98100
volumeAttributes:
99101
containerName: EXISTING_CONTAINER_NAME
100102
nodeStageSecretRef:

deploy/example/pv-blobfuse-auth.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,25 @@
22
apiVersion: v1
33
kind: PersistentVolume
44
metadata:
5+
annotations:
6+
pv.kubernetes.io/provisioned-by: blob.csi.azure.com
57
name: pv-blob
68
spec:
79
capacity:
810
storage: 10Gi
911
accessModes:
1012
- ReadWriteMany
11-
persistentVolumeReclaimPolicy: Retain # "Delete" is not supported in static provisioning
13+
persistentVolumeReclaimPolicy: Retain
1214
storageClassName: blob-fuse
1315
mountOptions:
1416
- -o allow_other
1517
- --file-cache-timeout-in-seconds=120
1618
csi:
1719
driver: blob.csi.azure.com
1820
readOnly: false
19-
# make sure volumeid is unique for every identical storage blob container in the cluster
20-
# character `#` is reserved for internal use and cannot be used in volumehandle
21-
volumeHandle: unique-volumeid
21+
# make sure volumeid is unique for every storage blob container in the cluster
22+
# the # character is reserved for internal use
23+
volumeHandle: account-name_container-name
2224
volumeAttributes:
2325
resourceGroup: EXISTING_RESOURCE_GROUP_NAME
2426
storageAccount: EXISTING_STORAGE_ACCOUNT_NAME

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

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,22 @@
22
apiVersion: v1
33
kind: PersistentVolume
44
metadata:
5+
annotations:
6+
pv.kubernetes.io/provisioned-by: blob.csi.azure.com
57
name: pv-blob-keyvault
68
spec:
79
capacity:
810
storage: 10Gi
911
accessModes:
1012
- ReadWriteMany
11-
persistentVolumeReclaimPolicy: Retain # If set as "Delete" container would be removed after pvc deletion
13+
persistentVolumeReclaimPolicy: Retain
1214
storageClassName: blob-fuse
1315
csi:
1416
driver: blob.csi.azure.com
1517
readOnly: false
16-
# make sure volumeid is unique for every identical storage blob container in the cluster
17-
# character `#` is reserved for internal use and cannot be used in volumehandle
18-
volumeHandle: unique-volumeid
18+
# make sure volumeid is unique for every storage blob container in the cluster
19+
# the # character is reserved for internal use
20+
volumeHandle: account-name_container-name
1921
volumeAttributes:
2022
containerName: EXISTING_CONTAINER_NAME
2123
storageAccountName: EXISTING_STORAGE_ACCOUNT_NAME

deploy/example/pv-blobfuse-csi.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,25 @@
22
apiVersion: v1
33
kind: PersistentVolume
44
metadata:
5+
annotations:
6+
pv.kubernetes.io/provisioned-by: blob.csi.azure.com
57
name: pv-blob
68
spec:
79
capacity:
810
storage: 10Gi
911
accessModes:
1012
- ReadWriteMany
11-
persistentVolumeReclaimPolicy: Retain # If set as "Delete" container would be removed after pvc deletion
13+
persistentVolumeReclaimPolicy: Retain
1214
storageClassName: blob-fuse
1315
mountOptions:
1416
- -o allow_other
1517
- --file-cache-timeout-in-seconds=120
1618
csi:
1719
driver: blob.csi.azure.com
1820
readOnly: false
19-
# make sure volumeid is unique for every identical storage blob container in the cluster
20-
# character `#` is reserved for internal use and cannot be used in volumehandle
21-
volumeHandle: unique-volumeid
21+
# make sure volumeid is unique for every storage blob container in the cluster
22+
# the # character is reserved for internal use
23+
volumeHandle: account-name_container-name
2224
volumeAttributes:
2325
resourceGroup: EXISTING_RESOURCE_GROUP_NAME
2426
storageAccount: EXISTING_STORAGE_ACCOUNT_NAME

deploy/example/pv-blobfuse-nfs.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,22 @@
22
apiVersion: v1
33
kind: PersistentVolume
44
metadata:
5+
annotations:
6+
pv.kubernetes.io/provisioned-by: blob.csi.azure.com
57
name: pv-blob
68
spec:
79
capacity:
810
storage: 10Gi
911
accessModes:
1012
- ReadWriteMany
11-
persistentVolumeReclaimPolicy: Retain # If set as "Delete" container would be removed after pvc deletion
13+
persistentVolumeReclaimPolicy: Retain
1214
storageClassName: blob-nfs
1315
csi:
1416
driver: blob.csi.azure.com
1517
readOnly: false
16-
# make sure volumeid is unique for every identical storage blob container in the cluster
17-
# character `#` is reserved for internal use and cannot be used in volumehandle
18-
volumeHandle: unique-volumeid
18+
# make sure volumeid is unique for every storage blob container in the cluster
19+
# the # character is reserved for internal use
20+
volumeHandle: account-name_container-name
1921
volumeAttributes:
2022
resourceGroup: EXISTING_RESOURCE_GROUP_NAME
2123
storageAccount: EXISTING_STORAGE_ACCOUNT_NAME

docs/driver-parameters.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ pvc-92a4d7f2-f23b-4904-bad4-2cbfcff6e388
6969
7070
Name | Meaning | Available Value | Mandatory | Default value
7171
--- | --- | --- | --- | ---
72-
volumeHandle | Specify a value the driver can use to uniquely identify the storage blob container in the cluster. | A recommended way to produce a unique value is to combine the globally unique storage account name and container name: {account-name}_{container-name}. Note: The # character is reserved for internal use and can't be used in a volume handle. | Yes |
72+
volumeHandle | Specify a value the driver can use to uniquely identify the storage blob container in the cluster. | A recommended way to produce a unique value is to combine the globally unique storage account name and container name: {account-name}_{container-name}. Note: the # character is reserved for internal use. | Yes |
7373
volumeAttributes.resourceGroup | Azure resource group name | existing resource group name | No | if empty, driver will use the same resource group name as current k8s cluster
7474
volumeAttributes.storageAccount | existing storage account name | existing storage account name | Yes |
7575
volumeAttributes.containerName | existing container name | existing container name | Yes |

0 commit comments

Comments
 (0)