Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support new max-volumes-per-node error message #573

Merged
merged 1 commit into from
Jun 5, 2024
Merged

Support new max-volumes-per-node error message #573

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions driver/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,13 @@ const (
// Digital Ocean API. NOTE: some queries inherit the context timeout
doAPITimeout = 10 * time.Second

// maxVolumesPerDropletErrorMessage is the error message returned by the DO
// API when the per-droplet volume limit would be exceeded.
maxVolumesPerDropletErrorMessage = "cannot attach more than 7 volumes to a single Droplet"
// maxVolumesPerDropletErrorLegacyMessage is the old error message returned by
// the DO API when the per-droplet volume limit would be exceeded.
maxVolumesPerDropletErrorLegacyMessage = "cannot attach more than 7 volumes to a single Droplet"

// maxVolumesPerDropletErrorMessage is the error message returned by the DO API
// when the per-droplet volume limit would be exceeded.
maxVolumesPerDropletErrorMessage = "cannot attach more volumes to the Droplet"
)

var (
Expand Down Expand Up @@ -384,7 +388,8 @@ func (d *Driver) ControllerPublishVolume(ctx context.Context, req *csi.Controlle
return nil, status.Errorf(codes.Aborted, "cannot attach because droplet %d has pending action for volume %q", dropletID, req.VolumeId)
}

if strings.Contains(err.Error(), maxVolumesPerDropletErrorMessage) {
if strings.Contains(err.Error(), maxVolumesPerDropletErrorMessage) ||
strings.Contains(err.Error(), maxVolumesPerDropletErrorLegacyMessage) {
return nil, status.Errorf(codes.ResourceExhausted, err.Error())
}
}
Expand Down
Loading