adding min cpu platform selection for GCP Machines and MachinePools

api/v1beta1/gcpmachine_types.go

@@ -220,6 +220,11 @@ type GCPMachineSpec struct {
 	// InstanceType is the type of instance to create. Example: n1.standard-2
 	InstanceType string `json:"instanceType"`
 
+	// MinCPUPlatform is the minimum CPU platform to use for the instance. The instance may be scheduled on the specified or newer CPU platform.
+	// applicable values are the friendly names of CPU platforms, such as minCpuPlatform: "Intel Haswell" or minCpuPlatform: "Intel Sandy Bridge".
+	// +optional
+	MinCPUPlatform *string `json:"minCPUPlatform,omitempty"`
+
 	// Subnet is a reference to the subnetwork to use for this instance. If not specified,
 	// the first subnetwork retrieved from the Cluster Region and Network is picked.
 	// +optional

cloud/scope/machine.go

@@ -268,6 +268,36 @@ func (m *MachineScope) InstanceImageSpec() *compute.AttachedDisk {
 	return disk
 }
 
+// MinCPUPlatform returns the min cpu platform for the machine pool.
+func (m *MachineScope) MinCPUPlatform() string {
+
+	// map of machine types to their respective processors (e2 cannot have a min cpu platform set, so it is not included here)
+	var processors = map[string]string{
+		"n1":  "Intel Skylake",
+		"n2":  "Intel Ice Lake",
+		"n2d": "AMD Milan",
+		"c3":  "Intel Sapphire Rapids",
+		"c2":  "Intel Cascade Lake",
+		"t2d": "AMD Milan",
+		"m1":  "Intel Skylake",
+	}
+
+	// If the min cpu platform is set on the GCPMachinePool, use the specified value.
+	if m.GCPMachine.Spec.MinCPUPlatform != nil {
+		return *m.GCPMachine.Spec.MinCPUPlatform
+	}
+
+	// If the min cpu platform is not set on the GCPMachinePool, use the default value for the machine type.
+	for machineType, processor := range processors {
+		if strings.HasPrefix(m.GCPMachine.Spec.InstanceType, machineType) {
+			return processor
+		}
+	}
+
+	// If the machine type is not recognized, return an empty string (This will hand off the processor selection to GCP).
+	return ""
+}
+
 // InstanceAdditionalDiskSpec returns compute instance additional attched-disk spec.
 func (m *MachineScope) InstanceAdditionalDiskSpec() []*compute.AttachedDisk {
 	additionalDisks := make([]*compute.AttachedDisk, 0, len(m.GCPMachine.Spec.AdditionalDisks))
@@ -370,9 +400,10 @@ func (m *MachineScope) InstanceAdditionalMetadataSpec() *compute.Metadata {
 // InstanceSpec returns instance spec.
 func (m *MachineScope) InstanceSpec(log logr.Logger) *compute.Instance {
 	instance := &compute.Instance{
-		Name:        m.Name(),
-		Zone:        m.Zone(),
-		MachineType: path.Join("zones", m.Zone(), "machineTypes", m.GCPMachine.Spec.InstanceType),
+		Name:           m.Name(),
+		Zone:           m.Zone(),
+		MachineType:    path.Join("zones", m.Zone(), "machineTypes", m.GCPMachine.Spec.InstanceType),
+		MinCpuPlatform: m.MinCPUPlatform(),
 		Tags: &compute.Tags{
 			Items: append(
 				m.GCPMachine.Spec.AdditionalNetworkTags,

cloud/scope/machinepool.go

@@ -148,7 +148,8 @@ func (m *MachinePoolScope) InstanceGroupTemplateBuilder(bootstrapData string) *c
 	instanceTemplate := &compute.InstanceTemplate{
 		Name: m.GCPMachinePool.Name,
 		Properties: &compute.InstanceProperties{
-			MachineType: m.GCPMachinePool.Spec.InstanceType,
+			MachineType:    m.GCPMachinePool.Spec.InstanceType,
+			MinCpuPlatform: m.MinCPUPlatform(),
 			Tags: &compute.Tags{
 				Items: append(
 					m.GCPMachinePool.Spec.AdditionalNetworkTags,
@@ -272,6 +273,36 @@ func (m *MachinePoolScope) InstanceImageSpec() *compute.AttachedDisk {
 	}
 }
 
+// MinCPUPlatform returns the min cpu platform for the machine pool.
+func (m *MachinePoolScope) MinCPUPlatform() string {
+
+	// map of machine types to their respective processors (e2 cannot have a min cpu platform set, so it is not included here)
+	var processors = map[string]string{
+		"n1":  "Intel Skylake",
+		"n2":  "Intel Ice Lake",
+		"n2d": "AMD Milan",
+		"c3":  "Intel Sapphire Rapids",
+		"c2":  "Intel Cascade Lake",
+		"t2d": "AMD Milan",
+		"m1":  "Intel Skylake",
+	}
+
+	// If the min cpu platform is set on the GCPMachinePool, use the specified value.
+	if m.GCPMachinePool.Spec.MinCPUPlatform != nil {
+		return *m.GCPMachinePool.Spec.MinCPUPlatform
+	}
+
+	// If the min cpu platform is not set on the GCPMachinePool, use the default value for the machine type.
+	for machineType, processor := range processors {
+		if strings.HasPrefix(m.GCPMachinePool.Spec.InstanceType, machineType) {
+			return processor
+		}
+	}
+
+	// If the machine type is not recognized, return an empty string (This will hand off the processor selection to GCP).
+	return ""
+}
+
 // Zone returns the zone for the machine pool.
 func (m *MachinePoolScope) Zone() string {
 	if m.MachinePool.Spec.Template.Spec.FailureDomain == nil {

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

@@ -120,6 +120,13 @@ spec:
               location:
                 description: Location is the GCP region location ex us-central1
                 type: string
+              minCPUPlatform:
+                description: 'MinCPUPlatform is the minimum CPU platform to use for
+                  the instance. The instance may be scheduled on the specified or
+                  newer CPU platform. applicable values are the friendly names of
+                  CPU platforms, such as minCpuPlatform: "Intel Haswell" or minCpuPlatform:
+                  "Intel Sandy Bridge".'
+                type: string
               network:
                 description: Network is the network to be used by machines in the
                   machine pool.

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

@@ -216,6 +216,13 @@ spec:
                 - Enabled
                 - Disabled
                 type: string
+              minCPUPlatform:
+                description: 'MinCPUPlatform is the minimum CPU platform to use for
+                  the instance. The instance may be scheduled on the specified or
+                  newer CPU platform. applicable values are the friendly names of
+                  CPU platforms, such as minCpuPlatform: "Intel Haswell" or minCpuPlatform:
+                  "Intel Sandy Bridge".'
+                type: string
               onHostMaintenance:
                 description: OnHostMaintenance determines the behavior when a maintenance
                   event occurs that might cause the instance to reboot. If omitted,

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

@@ -233,6 +233,13 @@ spec:
                         - Enabled
                         - Disabled
                         type: string
+                      minCPUPlatform:
+                        description: 'MinCPUPlatform is the minimum CPU platform to
+                          use for the instance. The instance may be scheduled on the
+                          specified or newer CPU platform. applicable values are the
+                          friendly names of CPU platforms, such as minCpuPlatform:
+                          "Intel Haswell" or minCpuPlatform: "Intel Sandy Bridge".'
+                        type: string
                       onHostMaintenance:
                         description: OnHostMaintenance determines the behavior when
                           a maintenance event occurs that might cause the instance

exp/api/v1beta1/gcpmachinepool_types.go

@@ -112,6 +112,11 @@ type GCPMachinePoolSpec struct {
 	// Location is the GCP region location ex us-central1
 	Location string `json:"location"`
 
+	// MinCPUPlatform is the minimum CPU platform to use for the instance. The instance may be scheduled on the specified or newer CPU platform.
+	// applicable values are the friendly names of CPU platforms, such as minCpuPlatform: "Intel Haswell" or minCpuPlatform: "Intel Sandy Bridge".
+	// +optional
+	MinCPUPlatform *string `json:"minCPUPlatform,omitempty"`
+
 	// Network is the network to be used by machines in the machine pool.
 	Network string `json:"network"`