Merge pull request #1341 from jwmay2012/guest-accelerators

Add GPU/Accelerator support to VMs in GCPMachineTemplate

Author: k8s-ci-robot

api/v1beta1/gcpmachine_types.go

@@ -360,6 +360,25 @@ type GCPMachineSpec struct {
 	// RootDiskEncryptionKey defines the KMS key to be used to encrypt the root disk.
 	// +optional
 	RootDiskEncryptionKey *CustomerEncryptionKey `json:"rootDiskEncryptionKey,omitempty"`
+
+	// GuestAccelerators is a list of the type and count of accelerator cards
+	// attached to the instance.
+	// +optional
+	GuestAccelerators []Accelerator `json:"guestAccelerators,omitempty"`
+}
+
+// Accelerator is a specification of the type and number of accelerator
+// cards attached to the instance.
+type Accelerator struct {
+	// Count is the number of the guest accelerator cards exposed to this
+	// instance.
+	Count int64 `json:"count,omitempty"`
+	// Type is the full or partial URL of the accelerator type resource to
+	// attach to this instance. For example:
+	// projects/my-project/zones/us-central1-c/acceleratorTypes/nvidia-tesla-p100
+	// If you are creating an instance template, specify only the accelerator name.
+	// See GPUs on Compute Engine for a full list of accelerator types.
+	Type string `json:"type,omitempty"`
 }
 
 // MetadataItem defines a single piece of metadata associated with an instance.

api/v1beta1/zz_generated.deepcopy.go

@@ -378,6 +378,22 @@ func (m *MachineScope) InstanceAdditionalMetadataSpec() *compute.Metadata {
 	return metadata
 }
 
+// InstanceGuestAcceleratorsSpec returns a slice of Guest Accelerator Config specs.
+func (m *MachineScope) InstanceGuestAcceleratorsSpec() []*compute.AcceleratorConfig {
+	if len(m.GCPMachine.Spec.GuestAccelerators) == 0 {
+		return nil
+	}
+	accelConfigs := make([]*compute.AcceleratorConfig, 0, len(m.GCPMachine.Spec.GuestAccelerators))
+	for _, accel := range m.GCPMachine.Spec.GuestAccelerators {
+		accelConfig := &compute.AcceleratorConfig{
+			AcceleratorType:  accel.Type,
+			AcceleratorCount: accel.Count,
+		}
+		accelConfigs = append(accelConfigs, accelConfig)
+	}
+	return accelConfigs
+}
+
 // InstanceSpec returns instance spec.
 func (m *MachineScope) InstanceSpec(log logr.Logger) *compute.Instance {
 	ctx := context.TODO()
@@ -472,6 +488,11 @@ func (m *MachineScope) InstanceSpec(log logr.Logger) *compute.Instance {
 	instance.Metadata = m.InstanceAdditionalMetadataSpec()
 	instance.ServiceAccounts = append(instance.ServiceAccounts, m.InstanceServiceAccountsSpec())
 	instance.NetworkInterfaces = append(instance.NetworkInterfaces, m.InstanceNetworkInterfaceSpec())
+	instance.GuestAccelerators = m.InstanceGuestAcceleratorsSpec()
+	if len(instance.GuestAccelerators) > 0 {
+		instance.Scheduling.OnHostMaintenance = "TERMINATE"
+	}
+
 	return instance
 }
 

cloud/scope/machine.go

@@ -208,6 +208,31 @@ spec:
                 - AMDEncryptedVirtualizationNestedPaging
                 - IntelTrustedDomainExtensions
                 type: string
+              guestAccelerators:
+                description: |-
+                  GuestAccelerators is a list of the type and count of accelerator cards
+                  attached to the instance.
+                items:
+                  description: |-
+                    Accelerator is a specification of the type and number of accelerator
+                    cards attached to the instance.
+                  properties:
+                    count:
+                      description: |-
+                        Count is the number of the guest accelerator cards exposed to this
+                        instance.
+                      format: int64
+                      type: integer
+                    type:
+                      description: |-
+                        Type is the full or partial URL of the accelerator type resource to
+                        attach to this instance. For example:
+                        projects/my-project/zones/us-central1-c/acceleratorTypes/nvidia-tesla-p100
+                        If you are creating an instance template, specify only the accelerator name.
+                        See GPUs on Compute Engine for a full list of accelerator types.
+                      type: string
+                  type: object
+                type: array
               image:
                 description: |-
                   Image is the full reference to a valid image to be used for this machine.

config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmachines.yaml

@@ -223,6 +223,31 @@ spec:
                         - AMDEncryptedVirtualizationNestedPaging
                         - IntelTrustedDomainExtensions
                         type: string
+                      guestAccelerators:
+                        description: |-
+                          GuestAccelerators is a list of the type and count of accelerator cards
+                          attached to the instance.
+                        items:
+                          description: |-
+                            Accelerator is a specification of the type and number of accelerator
+                            cards attached to the instance.
+                          properties:
+                            count:
+                              description: |-
+                                Count is the number of the guest accelerator cards exposed to this
+                                instance.
+                              format: int64
+                              type: integer
+                            type:
+                              description: |-
+                                Type is the full or partial URL of the accelerator type resource to
+                                attach to this instance. For example:
+                                projects/my-project/zones/us-central1-c/acceleratorTypes/nvidia-tesla-p100
+                                If you are creating an instance template, specify only the accelerator name.
+                                See GPUs on Compute Engine for a full list of accelerator types.
+                              type: string
+                          type: object
+                        type: array
                       image:
                         description: |-
                           Image is the full reference to a valid image to be used for this machine.

config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmachinetemplates.yaml

@@ -0,0 +1,26 @@
+# GPUs
+
+Add GPUs via the `guestAccelerators` field in `GCPMachineTemplate`.
+
+```
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: GCPMachineTemplate
+metadata:
+  name: mygcpmachinetemplate
+  namespace: mynamespace
+spec:
+  template:
+    spec:
+      image: projects/myproject/global/images/myimage
+      instanceType: n1-standard-2
+      guestAccelerators:
+      - type: projects/myproject/zones/us-central1-c/acceleratorTypes/nvidia-tesla-t4
+        count: 1
+```
+
+https://cloud.google.com/compute/docs/gpus
+
+NOTE: Instances with accelerators/GPUs do NOT support live migration. 
+Therefore, the `onHostMaintenance` event is always `TERMINATE`.
+https://cloud.google.com/compute/docs/instances/setting-vm-host-options