Skip to content

Commit

Permalink
Merge branch 'main' of github.com:exoscale/exoscale-csi-driver into p…
Browse files Browse the repository at this point in the history 
…ej/sc-82729/csi-implement-expand-volume
  • Loading branch information
@pierre-emmanuelJ
pierre-emmanuelJ committed Jan 31, 2024
2 parents d631d10 + fc86721 commit 4f9f3d3
Show file tree
Hide file tree
Showing 13 changed files with 119 additions and 73 deletions.
1 change: 1 addition & 0 deletions .github/workflows/integ-tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ jobs:
cd internal/integ/ && go test \
-v \
--create-cluster \
--create-csi-secret \
--tear-down-csi \
--image exoscale/csi-driver-integ-test:csi-pr-integ-test \
--cluster-name csi-pr-integ-test \
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## Unreleased

* Remove multizone and fix URL environment (#4)

## 0.29.0

### Features
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Since one `exoscale-csi-node` is deployed per node, you should see one pod per n
You can deploy a test App example to try it out.
```Bash
# You should see an Exoscale Block Storage Volume created in your Organization.
kubectl apply -f doc/examples/namespace.yaml
kubectl apply -f doc/examples/pvc.yaml
# You should see your example App pod running and the Volume attached to one of your nodes.
kubectl apply -f doc/examples/deployment.yaml
Expand Down
3 changes: 3 additions & 0 deletions cmd/exoscale-csi-driver/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"fmt"
"os"

v3 "github.com/exoscale/egoscale/v3"
"github.com/exoscale/exoscale-csi-driver/cmd/exoscale-csi-driver/buildinfo"
"github.com/exoscale/exoscale-csi-driver/driver"

Check failure on line 10 in cmd/exoscale-csi-driver/main.go

View workflow job for this annotation

GitHub Actions / build 

could not import github.com/exoscale/exoscale-csi-driver/driver (-: # github.com/exoscale/exoscale-csi-driver/driver

Expand Down Expand Up @@ -42,6 +43,7 @@ func main() {

apiKey := os.Getenv("EXOSCALE_API_KEY")
apiSecret := os.Getenv("EXOSCALE_API_SECRET")
apiURL := os.Getenv("EXOSCALE_API_URL")

// The node mode don't need secrets and do not interact with Exoscale API.
if *mode != string(driver.NodeMode) && (apiKey == "" || apiSecret == "") {
Expand All @@ -54,6 +56,7 @@ func main() {
Prefix: *prefix,
APIKey: apiKey,
APISecret: apiSecret,
Zone: v3.URL(apiURL),
})
if err != nil {
klog.Error(err)
Expand Down
96 changes: 45 additions & 51 deletions driver/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,16 @@ const (
)

type controllerService struct {
client *v3.Client
zone v3.URL
client *v3.Client
zone v3.URL
zoneName string
}

func newControllerService(client *v3.Client, nodeMeta *nodeMetadata) controllerService {
return controllerService{
client: client,
zone: nodeMeta.zone,
client: client,
zone: nodeMeta.zone,
zoneName: nodeMeta.zoneName,
}
}

Expand All @@ -109,10 +111,10 @@ func (d *controllerService) CreateVolume(ctx context.Context, req *csi.CreateVol
if v.Name == req.Name {
return &csi.CreateVolumeResponse{
Volume: &csi.Volume{
VolumeId: exoscaleID(d.zone, v.ID),
VolumeId: exoscaleID(d.zoneName, v.ID),
// API reply in bytes then send it without conversion
CapacityBytes: v.Size,
AccessibleTopology: newZoneTopology(d.zone),
AccessibleTopology: newZoneTopology(d.zoneName),
},
}, nil
}
Expand All @@ -129,14 +131,13 @@ func (d *controllerService) CreateVolume(ctx context.Context, req *csi.CreateVol
if srcSnapshot == nil {
return nil, status.Error(codes.Internal, "error retrieving snapshot from the volumeContentSource")
}
zone, snapshotID, err := getExoscaleID(srcSnapshot.SnapshotId)
_, snapshotID, err := getExoscaleID(srcSnapshot.SnapshotId)
if err != nil {
klog.Errorf("create volume from snapshot: %v", err)
return nil, err
}
client := d.client.WithURL(zone)

snapshot, err := client.GetBlockStorageSnapshot(ctx, snapshotID)
snapshot, err := d.client.GetBlockStorageSnapshot(ctx, snapshotID)
if err != nil {
if errors.Is(err, v3.ErrNotFound) {
klog.Errorf("create volume get snapshot not found: %v", err)
Expand Down Expand Up @@ -166,7 +167,7 @@ func (d *controllerService) CreateVolume(ctx context.Context, req *csi.CreateVol
BlockStorageSnapshot: snapshotTarget,
}

if err := v3.Validate(request); err != nil {
if err := d.client.Validate(request); err != nil {
klog.Errorf("create block storage volume validation: %v", err)
return nil, err
}
Expand All @@ -184,9 +185,9 @@ func (d *controllerService) CreateVolume(ctx context.Context, req *csi.CreateVol

return &csi.CreateVolumeResponse{
Volume: &csi.Volume{
VolumeId: exoscaleID(d.zone, opDone.Reference.ID),
VolumeId: exoscaleID(d.zoneName, opDone.Reference.ID),
CapacityBytes: sizeInBytes,
AccessibleTopology: newZoneTopology(d.zone),
AccessibleTopology: newZoneTopology(d.zoneName),
ContentSource: req.GetVolumeContentSource(),
},
}, nil
Expand All @@ -197,14 +198,13 @@ func (d *controllerService) CreateVolume(ctx context.Context, req *csi.CreateVol
func (d *controllerService) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequest) (*csi.DeleteVolumeResponse, error) {
klog.V(4).Infof("DeleteVolume")

zone, volumeID, err := getExoscaleID(req.VolumeId)
_, volumeID, err := getExoscaleID(req.VolumeId)
if err != nil {
klog.Errorf("parse exoscale volume ID %s: %v", req.VolumeId, err)
return nil, err
}
client := d.client.WithURL(zone)

op, err := client.DeleteBlockStorageVolume(ctx, volumeID)
op, err := d.client.DeleteBlockStorageVolume(ctx, volumeID)
if err != nil {
if errors.Is(err, v3.ErrNotFound) {
return &csi.DeleteVolumeResponse{}, nil
Expand All @@ -228,20 +228,19 @@ func (d *controllerService) DeleteVolume(ctx context.Context, req *csi.DeleteVol
func (d *controllerService) ControllerPublishVolume(ctx context.Context, req *csi.ControllerPublishVolumeRequest) (*csi.ControllerPublishVolumeResponse, error) {
klog.V(4).Infof("ControllerPublishVolume")

zone, instanceID, err := getExoscaleID(req.NodeId)
_, instanceID, err := getExoscaleID(req.NodeId)
if err != nil {
klog.Errorf("parse node ID %s: %v", req.NodeId, err)
return nil, err
}
client := d.client.WithURL(zone)

_, volumeID, err := getExoscaleID(req.VolumeId)
if err != nil {
klog.Errorf("parse exoscale volume ID %s: %v", req.VolumeId, err)
return nil, err
}

volume, err := client.GetBlockStorageVolume(ctx, volumeID)
volume, err := d.client.GetBlockStorageVolume(ctx, volumeID)
if err != nil {
if errors.Is(err, v3.ErrNotFound) {
return nil, status.Errorf(codes.NotFound, "volume %s not found", volumeID)
Expand All @@ -257,13 +256,13 @@ func (d *controllerService) ControllerPublishVolume(ctx context.Context, req *cs
PublishContext: map[string]string{
exoscaleVolumeName: volume.Name,
exoscaleVolumeID: volume.ID.String(),
exoscaleVolumeZone: string(zone),
exoscaleVolumeZone: string(d.zoneName),
},
}, nil
}
}

op, err := client.AttachBlockStorageVolumeToInstance(ctx, volumeID, v3.AttachBlockStorageVolumeToInstanceRequest{
op, err := d.client.AttachBlockStorageVolumeToInstance(ctx, volumeID, v3.AttachBlockStorageVolumeToInstanceRequest{
Instance: &v3.InstanceTarget{
ID: instanceID,
},
Expand All @@ -273,7 +272,7 @@ func (d *controllerService) ControllerPublishVolume(ctx context.Context, req *cs
return nil, err
}

_, err = client.Wait(ctx, op, v3.OperationStateSuccess)
_, err = d.client.Wait(ctx, op, v3.OperationStateSuccess)
if err != nil {
klog.Errorf("wait attach block storage volume %s to instance %s: %v", volumeID, instanceID, err)
return nil, err
Expand All @@ -283,7 +282,7 @@ func (d *controllerService) ControllerPublishVolume(ctx context.Context, req *cs
PublishContext: map[string]string{
exoscaleVolumeName: volume.Name,
exoscaleVolumeID: volume.ID.String(),
exoscaleVolumeZone: string(zone),
exoscaleVolumeZone: string(d.zoneName),
},
}, nil
}
Expand All @@ -294,14 +293,13 @@ func (d *controllerService) ControllerPublishVolume(ctx context.Context, req *cs
func (d *controllerService) ControllerUnpublishVolume(ctx context.Context, req *csi.ControllerUnpublishVolumeRequest) (*csi.ControllerUnpublishVolumeResponse, error) {
klog.V(4).Infof("ControllerUnpublishVolume")

zone, volumeID, err := getExoscaleID(req.VolumeId)
_, volumeID, err := getExoscaleID(req.VolumeId)
if err != nil {
klog.Errorf("parse exoscale volume ID %s: %v", req.VolumeId, err)
return nil, err
}
client := d.client.WithURL(zone)

op, err := client.DetachBlockStorageVolume(ctx, volumeID)
op, err := d.client.DetachBlockStorageVolume(ctx, volumeID)
if err != nil {
if errors.Is(err, v3.ErrNotFound) ||
(errors.Is(err, v3.ErrInvalidRequest) && strings.Contains(err.Error(), "Volume not attached")) {
Expand All @@ -327,14 +325,13 @@ func (d *controllerService) ControllerUnpublishVolume(ctx context.Context, req *
// This operation MUST be idempotent.
func (d *controllerService) ValidateVolumeCapabilities(ctx context.Context, req *csi.ValidateVolumeCapabilitiesRequest) (*csi.ValidateVolumeCapabilitiesResponse, error) {
klog.V(4).Infof("ValidateVolumeCapabilities")
zone, volumeID, err := getExoscaleID(req.VolumeId)
_, volumeID, err := getExoscaleID(req.VolumeId)
if err != nil {
klog.Errorf("parse exoscale ID %s: %v", req.VolumeId, err)
return nil, err
}
client := d.client.WithURL(zone)

_, err = client.GetBlockStorageVolume(ctx, volumeID)
_, err = d.client.GetBlockStorageVolume(ctx, volumeID)
if err != nil {
klog.Errorf("get block storage volume %s: %v", volumeID, err)
return nil, err
Expand Down Expand Up @@ -404,15 +401,15 @@ func (d *controllerService) ListVolumes(ctx context.Context, req *csi.ListVolume
for _, v := range volumes {
var instancesID []string
if v.Instance != nil && v.Instance.ID != "" {
instancesID = append(instancesID, exoscaleID(d.zone, v.Instance.ID))
instancesID = append(instancesID, exoscaleID(d.zoneName, v.Instance.ID))
}

volumesEntries = append(volumesEntries, &csi.ListVolumesResponse_Entry{
Volume: &csi.Volume{
VolumeId: exoscaleID(d.zone, v.ID),
VolumeId: exoscaleID(d.zoneName, v.ID),
// API reply in bytes then send it without conversion
CapacityBytes: v.Size,
AccessibleTopology: newZoneTopology(d.zone),
AccessibleTopology: newZoneTopology(d.zoneName),
},
Status: &csi.ListVolumesResponse_VolumeStatus{
PublishedNodeIds: instancesID,
Expand Down Expand Up @@ -453,29 +450,28 @@ func (d *controllerService) ControllerGetCapabilities(ctx context.Context, req *
func (d *controllerService) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshotRequest) (*csi.CreateSnapshotResponse, error) {
klog.V(4).Infof("CreateSnapshot")

zone, volumeID, err := getExoscaleID(req.SourceVolumeId)
_, volumeID, err := getExoscaleID(req.SourceVolumeId)
if err != nil {
klog.Errorf("parse exoscale ID %s: %v", req.SourceVolumeId, err)
return nil, err
}
client := d.client.WithURL(zone)

volume, err := client.GetBlockStorageVolume(ctx, volumeID)
volume, err := d.client.GetBlockStorageVolume(ctx, volumeID)
if err != nil {
klog.Errorf("create snapshot get volume %s: %v", volumeID, err)
}

for _, s := range volume.BlockStorageSnapshots {
snapshot, err := client.GetBlockStorageSnapshot(ctx, s.ID)
snapshot, err := d.client.GetBlockStorageSnapshot(ctx, s.ID)
if err != nil {
klog.Errorf("create snapshot get snapshot %s: %v", s.ID, err)
}

if snapshot.Name == req.Name {
return &csi.CreateSnapshotResponse{
Snapshot: &csi.Snapshot{
SnapshotId: exoscaleID(zone, snapshot.ID),
SourceVolumeId: exoscaleID(zone, volume.ID),
SnapshotId: exoscaleID(d.zoneName, snapshot.ID),
SourceVolumeId: exoscaleID(d.zoneName, volume.ID),
CreationTime: timestamppb.New(snapshot.CreatedAT),
ReadyToUse: true,
SizeBytes: volume.Size,
Expand All @@ -484,7 +480,7 @@ func (d *controllerService) CreateSnapshot(ctx context.Context, req *csi.CreateS
}
}

op, err := client.CreateBlockStorageSnapshot(ctx, volume.ID, v3.CreateBlockStorageSnapshotRequest{
op, err := d.client.CreateBlockStorageSnapshot(ctx, volume.ID, v3.CreateBlockStorageSnapshotRequest{
Name: req.Name,
})
if err != nil {
Expand Down Expand Up @@ -512,8 +508,8 @@ func (d *controllerService) CreateSnapshot(ctx context.Context, req *csi.CreateS

return &csi.CreateSnapshotResponse{
Snapshot: &csi.Snapshot{
SnapshotId: exoscaleID(zone, snapshot.ID),
SourceVolumeId: exoscaleID(zone, volume.ID),
SnapshotId: exoscaleID(d.zoneName, snapshot.ID),
SourceVolumeId: exoscaleID(d.zoneName, volume.ID),
CreationTime: timestamppb.New(snapshot.CreatedAT),
ReadyToUse: true,
SizeBytes: volume.Size,
Expand All @@ -525,22 +521,21 @@ func (d *controllerService) CreateSnapshot(ctx context.Context, req *csi.CreateS
func (d *controllerService) DeleteSnapshot(ctx context.Context, req *csi.DeleteSnapshotRequest) (*csi.DeleteSnapshotResponse, error) {
klog.V(4).Infof("DeleteSnapshot")

zone, snapshotID, err := getExoscaleID(req.SnapshotId)
_, snapshotID, err := getExoscaleID(req.SnapshotId)
if err != nil {
klog.Errorf("parse exoscale snapshot ID %s: %v", req.SnapshotId, err)
return nil, err
}
client := d.client.WithURL(zone)

op, err := client.DeleteBlockStorageSnapshot(ctx, snapshotID)
op, err := d.client.DeleteBlockStorageSnapshot(ctx, snapshotID)
if err != nil {
if errors.Is(err, v3.ErrNotFound) {
return &csi.DeleteSnapshotResponse{}, nil
}
return nil, err
}

if _, err := client.Wait(ctx, op, v3.OperationStateSuccess); err != nil {
if _, err := d.client.Wait(ctx, op, v3.OperationStateSuccess); err != nil {
return nil, err
}

Expand Down Expand Up @@ -589,8 +584,8 @@ func (d *controllerService) ListSnapshots(ctx context.Context, req *csi.ListSnap
for _, s := range snapshots {
snapshotsEntries = append(snapshotsEntries, &csi.ListSnapshotsResponse_Entry{
Snapshot: &csi.Snapshot{
SourceVolumeId: exoscaleID(d.zone, s.BlockStorageVolume.ID),
SnapshotId: exoscaleID(d.zone, s.ID),
SourceVolumeId: exoscaleID(d.zoneName, s.BlockStorageVolume.ID),
SnapshotId: exoscaleID(d.zoneName, s.ID),
CreationTime: timestamppb.New(s.CreatedAT),
ReadyToUse: true,
// TODO SizeBytes
Expand Down Expand Up @@ -659,14 +654,13 @@ func (d *controllerService) ControllerExpandVolume(ctx context.Context, req *csi

// ControllerGetVolume gets a volume and return it.
func (d *controllerService) ControllerGetVolume(ctx context.Context, req *csi.ControllerGetVolumeRequest) (*csi.ControllerGetVolumeResponse, error) {
zone, volumeID, err := getExoscaleID(req.VolumeId)
_, volumeID, err := getExoscaleID(req.VolumeId)
if err != nil {
klog.Errorf("parse exoscale ID %s: %v", req.VolumeId, err)
return nil, err
}
client := d.client.WithURL(zone)

volume, err := client.GetBlockStorageVolume(ctx, volumeID)
volume, err := d.client.GetBlockStorageVolume(ctx, volumeID)
if err != nil {
if errors.Is(err, v3.ErrNotFound) {
return nil, status.Errorf(codes.NotFound, "volume %s not found", volumeID)
Expand All @@ -678,12 +672,12 @@ func (d *controllerService) ControllerGetVolume(ctx context.Context, req *csi.Co

var instancesID []string
if volume.Instance != nil && volume.Instance.ID != "" {
instancesID = append(instancesID, exoscaleID(d.zone, volume.Instance.ID))
instancesID = append(instancesID, exoscaleID(d.zoneName, volume.Instance.ID))
}

return &csi.ControllerGetVolumeResponse{
Volume: &csi.Volume{
VolumeId: exoscaleID(zone, volume.ID),
VolumeId: exoscaleID(d.zoneName, volume.ID),
// API reply in bytes then send it without conversion
CapacityBytes: volume.Size,
},
Expand Down
Loading

0 comments on commit 4f9f3d3

Please # to comment.