Merge pull request #37 from kaytu-io/fix-add-spot

fix: add preemptible bool to optimization request
kaytu-io · Jul 8, 2024 · b285c61 · b285c61
2 parents 51aef7e + b69f4d0
commit b285c61
Show file tree

Hide file tree

Showing 5 changed files with 273 additions and 247 deletions.
diff --git a/plugin/processor/compute_instance/compute_instance_item.go b/plugin/processor/compute_instance/compute_instance_item.go
@@ -19,6 +19,7 @@ type ComputeInstanceItem struct {
 	MachineType         string
 	Region              string
 	Platform            string
+	Preemptible         bool
 	OptimizationLoading bool
 	Preferences         []*golang.PreferenceItem
 	Skipped             bool

diff --git a/plugin/processor/compute_instance/job_compute_instance_list.go b/plugin/processor/compute_instance/job_compute_instance_list.go
@@ -62,6 +62,7 @@ func (job *ListComputeInstancesJob) Run(ctx context.Context) error {
 			MachineType:         util.TrimmedString(*instance.MachineType, "/"),
 			Region:              util.TrimmedString(*instance.Zone, "/"),
 			Platform:            instance.GetCpuPlatform(),
+			Preemptible:         *instance.Scheduling.Preemptible,
 			OptimizationLoading: true,
 			Preferences:         job.processor.defaultPreferences,
 			Skipped:             false,

diff --git a/plugin/processor/compute_instance/job_optimize_compute_instance.go b/plugin/processor/compute_instance/job_optimize_compute_instance.go
@@ -111,6 +111,7 @@ func (job *OptimizeComputeInstancesJob) Run(ctx context.Context) error {
 			Id:          utils.HashString(item.Id),
 			Zone:        item.Region,
 			MachineType: item.MachineType,
+			Preemptible: item.Preemptible,
 		},
 		Disks:        disks,
 		Preferences:  preferencesMap,

diff --git a/plugin/proto/gcp_server.proto b/plugin/proto/gcp_server.proto
@@ -10,6 +10,7 @@ message GcpComputeInstance {
   string id = 1;
   string zone = 2;
   string machine_type = 3;
+  bool preemptible = 4;
 }
 
 message GcpComputeDisk {
@@ -74,7 +75,8 @@ message RightsizingGcpComputeInstance {
   string machine_family = 4;
   int64 cpu = 5;
   int64 memory_mb = 6;
-  double cost = 7;
+  bool preemptible = 7;
+  double cost = 8;
 }
 
 message GcpComputeInstanceRightsizingRecommendation {