diff --git a/build/lib/amd64-entrypoint.sh b/build/lib/amd64-entrypoint.sh index 96095944b..c82b22565 100644 --- a/build/lib/amd64-entrypoint.sh +++ b/build/lib/amd64-entrypoint.sh @@ -270,7 +270,8 @@ if [ "$run_oss" = "true" ] || [ "$run_disk" = "true" ]; then fi # takes 10s output=`${HOST_CMD} iohub-vfhp-helper -s` - if [[ $str == *"backend support auto vf hotplug."* ]]; then + if [[ $output == *"backend support auto vf hotplug."* ]]; then + echo "backend support auto vf hotplugin" ${HOST_CMD} sudo service iohub-vfhp-helper start else echo "backend not support auto vf hotplugin" diff --git a/build/lib/arm64-entrypoint.sh b/build/lib/arm64-entrypoint.sh index 46a732506..da0b7e1d1 100644 --- a/build/lib/arm64-entrypoint.sh +++ b/build/lib/arm64-entrypoint.sh @@ -195,7 +195,8 @@ if [ "$run_disk" = "true" ] || [ "$run_oss" = "true" ]; then fi # take 10s output=`${HOST_CMD} iohub-vfhp-helper -s` - if [[ $str == *"backend support auto vf hotplug."* ]]; then + if [[ $output == *"backend support auto vf hotplug."* ]]; then + echo "backend support auto vf hotplugin" ${HOST_CMD} sudo service iohub-vfhp-helper start else echo "backend not support auto vf hotplugin" diff --git a/examples/disk/shared-disk/pv.yaml b/examples/disk/shared-disk/pv.yaml deleted file mode 100644 index 3ed801e78..000000000 --- a/examples/disk/shared-disk/pv.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: v-bp1gfkd22hda4qzeg1o6 -spec: - accessModes: - - ReadWriteMany - capacity: - storage: 20Gi - volumeMode: Block - storageClassName: csi-disk - csi: - driver: diskplugin.csi.alibabacloud.com - volumeHandle: v-bp1gfkd22hda4qzeg1o6 - volumeAttributes: - zoneId: cn-hangzhou-b - shared: enable \ No newline at end of file diff --git a/examples/disk/shared-disk/pvc.yaml b/examples/disk/shared-disk/pvc.yaml index 53f7145d8..77bf7d3a1 100644 --- a/examples/disk/shared-disk/pvc.yaml +++ b/examples/disk/shared-disk/pvc.yaml @@ -6,7 +6,7 @@ spec: accessModes: - ReadWriteMany volumeMode: Block - storageClassName: csi-disk + storageClassName: alicloud-disk-essd-multi-attach-wait resources: requests: storage: 20Gi \ No newline at end of file diff --git a/examples/disk/shared-disk/storageclass.yaml b/examples/disk/shared-disk/storageclass.yaml index 71d353bdf..08d782f93 100644 --- a/examples/disk/shared-disk/storageclass.yaml +++ b/examples/disk/shared-disk/storageclass.yaml @@ -1,12 +1,11 @@ +allowVolumeExpansion: true apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: - name: csi-disk -provisioner: diskplugin.csi.alibabacloud.com + name: alicloud-disk-essd-multi-attach-wait parameters: - zoneId: cn-hangzhou-b - regionId: cn-hangzhou - fsType: ext4 - type: san_ssd - readOnly: "false" -reclaimPolicy: Retain \ No newline at end of file + type: cloud_essd + multiAttach: "true" +provisioner: diskplugin.csi.alibabacloud.com +reclaimPolicy: Delete +volumeBindingMode: WaitForFirstConsumer