From b6e25ef0217469f5179d56694cd99222d9ff3da5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E7=8E=AE=E6=96=87?= Date: Tue, 18 Feb 2025 11:36:13 +0800 Subject: [PATCH] disk: refuse to delete disk on ACS --- pkg/disk/controllerserver.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/disk/controllerserver.go b/pkg/disk/controllerserver.go index bc933e327..341c9fa00 100644 --- a/pkg/disk/controllerserver.go +++ b/pkg/disk/controllerserver.go @@ -273,11 +273,11 @@ func (cs *controllerServer) DeleteVolume(ctx context.Context, req *csi.DeleteVol } } if disk.Status == DiskStatusInuse && canDetach { - if strings.HasPrefix(disk.InstanceId, "eci-") { - // We should never be asked to delete a disk on an ECI instance. + if strings.HasPrefix(disk.InstanceId, "eci-") || strings.HasPrefix(disk.InstanceId, "acs-") { + // We should never be asked to delete a disk on an serverless instance. // If we reach here, something goes seriously wrong. // TODO: ECI does not support multi-attach? - return nil, status.Errorf(codes.Internal, "refuse to delete disk on ECI instance %s", disk.InstanceId) + return nil, status.Errorf(codes.Internal, "refuse to delete disk on serverless instance %s", disk.InstanceId) } err := cs.ad.detachDisk(ctx, ecsClient, req.VolumeId, disk.InstanceId) if err != nil {