Add gcp local ssd disk support (#414)

* add gcp local ssd disk support * set gcp disk AutoDelete default value to true * address comment
gardener · Apr 14, 2020 · ec6f466 · ec6f466
1 parent b6ab9df
commit ec6f466
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 17 deletions.
diff --git a/pkg/apis/machine/types.go b/pkg/apis/machine/types.go
@@ -1019,10 +1019,11 @@ type GCPMachineClassSpec struct {
 
 // GCPDisk describes disks for GCP.
 type GCPDisk struct {
-	AutoDelete bool
+	AutoDelete *bool
 	Boot       bool
 	SizeGb     int64
 	Type       string
+	Interface  string
 	Image      string
 	Labels     map[string]string
 }

diff --git a/pkg/apis/machine/v1alpha1/types.go b/pkg/apis/machine/v1alpha1/types.go
@@ -1107,10 +1107,11 @@ type GCPMachineClassSpec struct {
 
 // GCPDisk describes disks for GCP.
 type GCPDisk struct {
-	AutoDelete bool              `json:"autoDelete"`
+	AutoDelete *bool             `json:"autoDelete"`
 	Boot       bool              `json:"boot"`
 	SizeGb     int64             `json:"sizeGb"`
 	Type       string            `json:"type"`
+	Interface  string            `json:"interface"`
 	Image      string            `json:"image"`
 	Labels     map[string]string `json:"labels"`
 }

diff --git a/pkg/apis/machine/v1alpha1/zz_generated.conversion.go b/pkg/apis/machine/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/machine/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/machine/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/machine/validation/gcpmachineclass.go b/pkg/apis/machine/validation/gcpmachineclass.go
@@ -97,8 +97,11 @@ func validateGCPDisks(disks []*machine.GCPDisk, fldPath *field.Path) field.Error
 		if disk.SizeGb < 20 {
 			allErrs = append(allErrs, field.Invalid(idxPath.Child("sizeGb"), disk.SizeGb, "disk size must be at least 20 GB"))
 		}
-		if disk.Type != "pd-standard" && disk.Type != "pd-ssd" {
-			allErrs = append(allErrs, field.NotSupported(idxPath.Child("type"), disk.Type, []string{"pd-standard", "pd-ssd"}))
+		if disk.Type != "pd-standard" && disk.Type != "pd-ssd" && disk.Type != "SCRATCH" {
+			allErrs = append(allErrs, field.NotSupported(idxPath.Child("type"), disk.Type, []string{"pd-standard", "pd-ssd", "SCRATCH"}))
+		}
+		if disk.Type == "SCRATCH" && (disk.Interface != "NVME" && disk.Interface != "SCSI") {
+			allErrs = append(allErrs, field.NotSupported(idxPath.Child("interface"), disk.Interface, []string{"NVME", "SCSI"}))
 		}
 		if disk.Boot && "" == disk.Image {
 			allErrs = append(allErrs, field.Required(idxPath.Child("image"), "image is required for boot disk"))

diff --git a/pkg/apis/machine/zz_generated.deepcopy.go b/pkg/apis/machine/zz_generated.deepcopy.go
diff --git a/pkg/driver/driver_gcp.go b/pkg/driver/driver_gcp.go
@@ -84,16 +84,33 @@ func (d *GCPDriver) Create() (string, string, error) {
 
 	var disks = []*compute.AttachedDisk{}
 	for _, disk := range d.GCPMachineClass.Spec.Disks {
-		disks = append(disks, &compute.AttachedDisk{
-			AutoDelete: disk.AutoDelete,
-			Boot:       disk.Boot,
-			InitializeParams: &compute.AttachedDiskInitializeParams{
-				DiskSizeGb:  disk.SizeGb,
-				DiskType:    fmt.Sprintf("zones/%s/diskTypes/%s", zone, disk.Type),
-				Labels:      disk.Labels,
-				SourceImage: disk.Image,
-			},
-		})
+		var attachedDisk compute.AttachedDisk
+		autoDelete := false
+		if disk.AutoDelete == nil || *disk.AutoDelete == true {
+			autoDelete = true
+		}
+		if disk.Type == "SCRATCH" {
+			attachedDisk = compute.AttachedDisk{
+				AutoDelete: autoDelete,
+				Type:       disk.Type,
+				Interface:  disk.Interface,
+				InitializeParams: &compute.AttachedDiskInitializeParams{
+					DiskType: fmt.Sprintf("zones/%s/diskTypes/%s", zone, "local-ssd"),
+				},
+			}
+		} else {
+			attachedDisk = compute.AttachedDisk{
+				AutoDelete: autoDelete,
+				Boot:       disk.Boot,
+				InitializeParams: &compute.AttachedDiskInitializeParams{
+					DiskSizeGb:  disk.SizeGb,
+					DiskType:    fmt.Sprintf("zones/%s/diskTypes/%s", zone, disk.Type),
+					Labels:      disk.Labels,
+					SourceImage: disk.Image,
+				},
+			}
+		}
+		disks = append(disks, &attachedDisk)
 	}
 	instance.Disks = disks
 

diff --git a/pkg/openapi/openapi_generated.go b/pkg/openapi/openapi_generated.go