Merge pull request #300 from alexander-demichev/preemptible

Add support for preemptible instances
kubernetes-sigs · Feb 5, 2021 · c495997 · c495997
2 parents c4f7588 + d083cb5
commit c495997
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/api/v1alpha3/gcpmachine_types.go b/api/v1alpha3/gcpmachine_types.go
@@ -96,6 +96,10 @@ type GCPMachineSpec struct {
 	// Defaults to: email: "default", scope: []{compute.CloudPlatformScope}
 	// +optional
 	ServiceAccount *ServiceAccount `json:"serviceAccounts,omitempty"`
+
+	// Preemptible defines if instance is preemptible
+	// +optional
+	Preemptible bool `json:"preemptible,omitempty"`
 }
 
 // GCPMachineStatus defines the observed state of GCPMachine.

diff --git a/cloud/services/compute/instances.go b/cloud/services/compute/instances.go
@@ -108,6 +108,9 @@ func (s *Service) CreateInstance(scope *scope.MachineScope) (*compute.Instance,
 				},
 			},
 		},
+		Scheduling: &compute.Scheduling{
+			Preemptible: scope.GCPMachine.Spec.Preemptible,
+		},
 	}
 
 	if scope.GCPMachine.Spec.ServiceAccount != nil {

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmachines.yaml
@@ -87,6 +87,9 @@ spec:
                 description: 'InstanceType is the type of instance to create. Example:
                   n1.standard-2'
                 type: string
+              preemptible:
+                description: Preemptible defines if instance is preemptible
+                type: boolean
               providerID:
                 description: ProviderID is the unique identifier as specified by the
                   cloud provider.

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_gcpmachinetemplates.yaml
@@ -76,6 +76,9 @@ spec:
                         description: 'InstanceType is the type of instance to create.
                           Example: n1.standard-2'
                         type: string
+                      preemptible:
+                        description: Preemptible defines if instance is preemptible
+                        type: boolean
                       providerID:
                         description: ProviderID is the unique identifier as specified
                           by the cloud provider.
-Original file line number
+Diff line change
@@ Expand Up @@
     				},
     			},
     		},
+    		Scheduling: &compute.Scheduling{
+    			Preemptible: scope.GCPMachine.Spec.Preemptible,
+    		},
     	}
     	if scope.GCPMachine.Spec.ServiceAccount != nil {
@@ Expand Down @@