aarch64 support (#239)

* aarch64 support

Author: gotsysdba

opentofu/locals.tf

@@ -8,16 +8,6 @@ locals {
   label_prefix     = var.label_prefix != "" ? lower(var.label_prefix) : lower(random_pet.label.id)
 }
 
-// Autonomous Database
-locals {
-  adb_name = format("%sDB", upper(local.label_prefix))
-  adb_whitelist_cidrs = concat(
-    var.adb_whitelist_cidrs != "" ? split(",", replace(var.adb_whitelist_cidrs, "/\\s+/", "")) : [],
-    [module.network.vcn_ocid]
-  )
-  adb_password = sensitive(format("%s%s", random_password.adb_char.result, random_password.adb_rest.result))
-}
-
 // Availability Domains
 locals {
   ads = data.oci_identity_availability_domains.all.availability_domains
@@ -37,6 +27,25 @@ locals {
   ])
 }
 
+// Autonomous Database
+locals {
+  adb_name = format("%sDB", upper(local.label_prefix))
+  adb_whitelist_cidrs = concat(
+    var.adb_whitelist_cidrs != "" ? split(",", replace(var.adb_whitelist_cidrs, "/\\s+/", "")) : [],
+    [module.network.vcn_ocid]
+  )
+  adb_password = sensitive(format("%s%s", random_password.adb_char.result, random_password.adb_rest.result))
+}
+
+// Compute
+locals {
+  compute_cpu_arch = (
+    can(regex("^VM\\.Standard\\.A[0-9]+\\.Flex$", var.compute_cpu_shape))
+    ? "aarch64"
+    : "x86_64"
+  )
+}
+
 // Network
 locals {
   streamlit_client_port = 8501

opentofu/main.tf

@@ -124,6 +124,7 @@ module "kubernetes" {
   k8s_cpu_node_pool_size         = var.k8s_cpu_node_pool_size
   k8s_api_endpoint_allowed_cidrs = var.k8s_api_endpoint_allowed_cidrs
   k8s_run_cfgmgt                 = var.k8s_run_cfgmgt
+  compute_cpu_arch               = local.compute_cpu_arch
   compute_os_ver                 = local.compute_os_ver
   compute_cpu_ocpu               = var.compute_cpu_ocpu
   compute_gpu_shape              = var.compute_gpu_shape

opentofu/modules/kubernetes/cfgmgt.tf

@@ -66,7 +66,7 @@ resource "null_resource" "apply" {
     local_sensitive_file.kubeconfig,
     local_sensitive_file.helm_values,
     local_sensitive_file.k8s_manifest,
-    oci_containerengine_node_pool.default_node_pool_details,
+    oci_containerengine_node_pool.cpu_node_pool_details,
     oci_containerengine_node_pool.gpu_node_pool_details,
     oci_containerengine_addon.oraoper_addon,
     oci_containerengine_addon.certmgr_addon,

opentofu/modules/kubernetes/iam.tf

@@ -8,7 +8,7 @@ resource "oci_identity_dynamic_group" "workers_dynamic_group" {
   description    = format("%s Workers Dynamic Group", var.label_prefix)
   matching_rule = format(
     "ALL {instance.compartment.id = '%s', tag.Oracle-Tags.CreatedBy.value = '%s'}",
-  var.compartment_id, oci_containerengine_node_pool.default_node_pool_details.id)
+  var.compartment_id, oci_containerengine_node_pool.cpu_node_pool_details.id)
   provider = oci.home_region
 }
 

opentofu/modules/kubernetes/locals.tf

@@ -32,7 +32,7 @@ locals {
   oke_worker_cpu_image = length(local.oke_worker_images) > 0 ? [
     for key, value in local.oke_worker_images : key if
     value["image_type"] == "oke" &&
-    value["arch"] == "x86_64" &&
+    value["arch"] == var.compute_cpu_arch &&
     value["os_version"] == var.compute_os_ver &&
     value["k8s_version"] == var.k8s_version &&
     !value["is_gpu"]

opentofu/modules/kubernetes/main.tf

@@ -104,11 +104,11 @@ resource "oci_containerengine_addon" "ingress_addon" {
   }
 }
 
-resource "oci_containerengine_node_pool" "default_node_pool_details" {
+resource "oci_containerengine_node_pool" "cpu_node_pool_details" {
   cluster_id         = oci_containerengine_cluster.default_cluster.id
   compartment_id     = var.compartment_id
   kubernetes_version = format("v%s", var.k8s_version)
-  name               = format("%s-np-default", var.label_prefix)
+  name               = format("%s-np-cpu", var.label_prefix)
   initial_node_labels {
     key   = "name"
     value = local.k8s_cluster_name

opentofu/modules/kubernetes/templates/cloudinit-oke.sh

@@ -6,8 +6,17 @@
 ## https://docs.oracle.com/en-us/iaas/Content/Compute/Tasks/gettingmetadata.htm
 oke_init_url='http://169.254.169.254/opc/v2/instance/metadata/oke_init_script'
 curl --fail -H "Authorization: Bearer Oracle" -L0 "${oke_init_url}" | base64 --decode >/var/run/oke-init.sh
+
+# detect architecture
+arch=$(uname -m)
+if [ "$arch" = "aarch64" ]; then
+    binary_url="https://github.com/oracle-devrel/oke-credential-provider-for-ocir/releases/latest/download/oke-credential-provider-for-ocir-linux-arm64"
+else
+    binary_url="https://github.com/oracle-devrel/oke-credential-provider-for-ocir/releases/latest/download/oke-credential-provider-for-ocir-linux-amd64"
+fi
+
 # download OCIR Access binaries on the worker node
-wget https://github.com/oracle-devrel/oke-credential-provider-for-ocir/releases/latest/download/oke-credential-provider-for-ocir-linux-amd64 -O /usr/local/bin/credential-provider-oke
+wget "$binary_url" -O /usr/local/bin/credential-provider-oke
 wget https://github.com/oracle-devrel/oke-credential-provider-for-ocir/releases/latest/download/credential-provider-config.yaml -P /etc/kubernetes/
 # add permission to execute
 sudo chmod 755 /usr/local/bin/credential-provider-oke

opentofu/modules/kubernetes/variables.tf

@@ -82,10 +82,15 @@ variable "k8s_gpu_node_pool_size" {
 variable "compute_gpu_shape" {
   type = string
 }
+
 variable "compute_os_ver" {
   type = string
 }
 
+variable "compute_cpu_arch" {
+  type = string
+}
+
 variable "compute_cpu_shape" {
   type = string
 }

opentofu/modules/vm/templates/cloudinit-compute.tpl

@@ -13,6 +13,7 @@ package_update: false
 packages:
   - python36-oci-cli
   - python3.11
+  - jre
   - sqlcl
 
 write_files:

opentofu/schema.yaml

@@ -170,9 +170,12 @@ variables:
     type: enum
     title: "CPU Worker Shape"
     required: true
+    default: "VM.Standard.E5.Flex"
     enum:
-      - "VM.Standard.E5.Flex"
       - "VM.Standard.E4.Flex"
+      - "VM.Standard.E5.Flex"
+      - "VM.Standard.A1.Flex"
+      - "VM.Standard.A2.Flex"
     visible:
       or:
         - and: