Fix oke image selection for A2 shapes

robo-cap · hyder · commit d29a71584312 · 2025-03-31T23:10:16.000+11:00
diff --git a/modules/cluster/versions.tf b/modules/cluster/versions.tf
@@ -7,7 +7,7 @@ terraform {
   required_providers {
     oci = {
       source  = "oracle/oci"
-      version = ">= 6.28.0"
+      version = ">= 6.32.0"
     }
   }
 }
diff --git a/modules/workers/locals.tf b/modules/workers/locals.tf
@@ -115,7 +115,7 @@ locals {
             lookup(var.image_ids, "platform", null),
             lookup(var.image_ids, pool.image_type, null),
             length(regexall("GPU", pool.shape)) > 0 ? var.image_ids.gpu : var.image_ids.nongpu,
-            length(regexall("A1\\.", pool.shape)) > 0 ? var.image_ids.aarch64 : var.image_ids.x86_64,
+            length(regexall("A[12]\\.", pool.shape)) > 0 ? var.image_ids.aarch64 : var.image_ids.x86_64,
             lookup(var.image_ids, format("%v %v", pool.os, split(".", pool.os_version)[0]), null),
           ]...)): "${var.indexed_images[entry].sort_key}###${entry}"])), 0)), 1)
       )

Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ locals {`
`115`	`115`	`lookup(var.image_ids, "platform", null),`
`116`	`116`	`lookup(var.image_ids, pool.image_type, null),`
`117`	`117`	`length(regexall("GPU", pool.shape)) > 0 ? var.image_ids.gpu : var.image_ids.nongpu,`
`118`		`- length(regexall("A1\\.", pool.shape)) > 0 ? var.image_ids.aarch64 : var.image_ids.x86_64,`
	`118`	`+ length(regexall("A[12]\\.", pool.shape)) > 0 ? var.image_ids.aarch64 : var.image_ids.x86_64,`
`119`	`119`	`lookup(var.image_ids, format("%v %v", pool.os, split(".", pool.os_version)[0]), null),`
`120`	`120`	`]...)): "${var.indexed_images[entry].sort_key}###${entry}"])), 0)), 1)`
`121`	`121`	`)`