Skip to content

Migrate Hyperdisk/CHD/StoragePools to GCE v1 disk API #1666

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

Merged
merged 1 commit into from
Apr 16, 2024
Merged

Migrate Hyperdisk/CHD/StoragePools to GCE v1 disk API #1666

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion pkg/gce-cloud-provider/compute/fake-gce.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ func (cloud *FakeCloudProvider) InsertDisk(ctx context.Context, project string,
}

if containsBetaDiskType(hyperdiskTypes, params.DiskType) {
betaDisk := convertV1DiskToBetaDisk(computeDisk, params.ProvisionedThroughputOnCreate)
betaDisk := convertV1DiskToBetaDisk(computeDisk)
betaDisk.EnableConfidentialCompute = params.EnableConfidentialCompute
cloud.disks[volKey.Name] = CloudDiskFromBeta(betaDisk)
} else {
Expand Down
36 changes: 24 additions & 12 deletions pkg/gce-cloud-provider/compute/gce-compute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ func convertV1CustomerEncryptionKeyToBeta(v1Key *computev1.CustomerEncryptionKey
}
}

func convertV1DiskToBetaDisk(v1Disk *computev1.Disk, provisionedThroughputOnCreate int64) *computebeta.Disk {
func convertV1DiskToBetaDisk(v1Disk *computev1.Disk) *computebeta.Disk {
var dek *computebeta.CustomerEncryptionKey = nil

if v1Disk.DiskEncryptionKey != nil {
Expand All @@ -444,12 +444,17 @@ func convertV1DiskToBetaDisk(v1Disk *computev1.Disk, provisionedThroughputOnCrea
Status: v1Disk.Status,
SelfLink: v1Disk.SelfLink,
}

// Hyperdisk doesn't currently support multiWriter (https://cloud.google.com/compute/docs/disks/hyperdisks#limitations),
// but if multiWriter + hyperdisk is supported in the future, we want the PDCSI driver to support this feature without
// any additional code change.
if v1Disk.ProvisionedIops > 0 {
betaDisk.ProvisionedIops = v1Disk.ProvisionedIops
}
if provisionedThroughputOnCreate > 0 {
betaDisk.ProvisionedThroughput = provisionedThroughputOnCreate
if v1Disk.ProvisionedThroughput > 0 {
betaDisk.ProvisionedThroughput = v1Disk.ProvisionedThroughput
}
betaDisk.StoragePool = v1Disk.StoragePool

return betaDisk
}
Expand Down Expand Up @@ -543,7 +548,7 @@ func (cloud *CloudProvider) insertRegionalDisk(

if gceAPIVersion == GCEAPIVersionBeta {
var insertOp *computebeta.Operation
betaDiskToCreate := convertV1DiskToBetaDisk(diskToCreate, 0)
betaDiskToCreate := convertV1DiskToBetaDisk(diskToCreate)
betaDiskToCreate.MultiWriter = multiWriter
insertOp, err = cloud.betaService.RegionDisks.Insert(project, volKey.Region, betaDiskToCreate).Context(ctx).Do()
if insertOp != nil {
Expand Down Expand Up @@ -619,13 +624,9 @@ func (cloud *CloudProvider) insertZonalDisk(
opName string
gceAPIVersion = GCEAPIVersionV1
)
if multiWriter || containsBetaDiskType(hyperdiskTypes, params.DiskType) {
if multiWriter {
gceAPIVersion = GCEAPIVersionBeta
}
storagePoolsEnabled := params.StoragePools != nil
if storagePoolsEnabled {
gceAPIVersion = GCEAPIVersionAlpha
}

diskToCreate := &computev1.Disk{
Name: volKey.Name,
Expand All @@ -638,6 +639,17 @@ func (cloud *CloudProvider) insertZonalDisk(
if params.ProvisionedIOPSOnCreate > 0 {
diskToCreate.ProvisionedIops = params.ProvisionedIOPSOnCreate
}
if params.ProvisionedThroughputOnCreate > 0 {
diskToCreate.ProvisionedThroughput = params.ProvisionedThroughputOnCreate
}

if params.StoragePools != nil {
sp := common.StoragePoolInZone(params.StoragePools, volKey.Zone)
if sp == nil {
return status.Errorf(codes.InvalidArgument, "cannot create disk in zone %q: no Storage Pools exist in zone", volKey.Zone)
}
diskToCreate.StoragePool = sp.ResourceName
}

if snapshotID != "" {
_, snapshotType, _, err := common.SnapshotIDToProjectKey(snapshotID)
Expand All @@ -662,20 +674,20 @@ func (cloud *CloudProvider) insertZonalDisk(
KmsKeyName: params.DiskEncryptionKMSKey,
}
}
diskToCreate.EnableConfidentialCompute = params.EnableConfidentialCompute

if gceAPIVersion == GCEAPIVersionBeta {
var insertOp *computebeta.Operation
betaDiskToCreate := convertV1DiskToBetaDisk(diskToCreate, params.ProvisionedThroughputOnCreate)
betaDiskToCreate := convertV1DiskToBetaDisk(diskToCreate)
betaDiskToCreate.MultiWriter = multiWriter
betaDiskToCreate.EnableConfidentialCompute = params.EnableConfidentialCompute
insertOp, err = cloud.betaService.Disks.Insert(project, volKey.Zone, betaDiskToCreate).Context(ctx).Do()
if insertOp != nil {
opName = insertOp.Name
}
} else if gceAPIVersion == GCEAPIVersionAlpha {
var insertOp *computealpha.Operation
var storagePool *common.StoragePool
if storagePoolsEnabled {
if params.StoragePools != nil {
storagePool = common.StoragePoolInZone(params.StoragePools, volKey.Zone)
if storagePool == nil {
return status.Errorf(codes.InvalidArgument, "cannot create disk in zone %q: no Storage Pools exist in zone", volKey.Zone)
Expand Down