Improve ubuntu worker nodes bootstrapping logic

Author: robo-cap

modules/workers/cloudinit-ubuntu.sh.tftpl

@@ -0,0 +1,27 @@
+#!/bin/bash
+set -x
+
+source /etc/os-release
+
+oke_package_name="oci-oke-node-all-${oke_minor_version}"
+
+# Add OKE Ubuntu package repo
+tee /etc/apt/sources.list.d/oke-node-client.sources <<EOF
+Enabled: yes
+Types: deb
+URIs: https://odx-oke.objectstorage.us-sanjose-1.oci.customer-oci.com/n/odx-oke/b/okn-repositories/o/prod/ubuntu-${version_codename}/kubernetes-${oke_major_version}
+Suites: stable
+Components: main
+Trusted: yes
+EOF
+
+# Wait for apt lock and install the package
+while fuser /var/{lib/{dpkg/{lock,lock-frontend},apt/lists},cache/apt/archives}/lock >/dev/null 2>&1; do
+   echo "Waiting for dpkg/apt lock"
+   sleep 1
+done
+
+apt-get -y update && apt-get -y install $oke_package_name
+
+# OKE bootstrap
+oke bootstrap

modules/workers/cloudinit.tf

@@ -100,28 +100,17 @@ data "cloudinit_config" "workers" {
   dynamic "part" {
     for_each = !each.value.disable_default_cloud_init && lookup(local.ubuntu_worker_pools, each.key, null) != null ? [1] : []
     content {
-      content_type = "text/cloud-config"
-      content = jsonencode({
-        # https://cloudinit.readthedocs.io/en/latest/reference/modules.html#apt-configure
-        apt = {
-          sources = {
-            oke-node = {
-              source =  format("deb [trusted=yes] https://odx-oke.objectstorage.us-sanjose-1.oci.customer-oci.com/n/odx-oke/b/okn-repositories/o/prod/ubuntu-%s/kubernetes-%s stable main",
-              length(regexall( "22\\.04", lookup(lookup(local.ubuntu_worker_pools, each.key, {}), "ubuntu_release", "22.04"))) > 0 ? "jammy" : "noble",
-              lookup(lookup(local.ubuntu_worker_pools, each.key, {}), "kubernetes_major_version", ""))
-            }
-          }
+      content_type = "text/x-shellscript"
+      content      = templatefile(
+        "${path.module}/cloudinit-ubuntu.sh.tftpl",
+        {
+          version_codename  = lookup(local.ubuntu_supported_versions, lookup(lookup(local.ubuntu_worker_pools, each.key, {}), "ubuntu_release", lookup(each.value, "os_version")), "unsupported_ubuntu_version"),
+          oke_major_version = lookup(lookup(local.ubuntu_worker_pools, each.key, {}), "kubernetes_major_version", "")
+          oke_minor_version = lookup(lookup(local.ubuntu_worker_pools, each.key, {}), "kubernetes_minor_version", "")
         }
-        package_update = true
-        packages = [{
-          apt = [format("oci-oke-node-all-%s", lookup(lookup(local.ubuntu_worker_pools, each.key, {}), "kubernetes_minor_version", ""))]
-        }]
-        runcmd = [
-          "oke bootstrap"
-        ]
-      })
-      filename   = "50-oke-ubuntu.yml"
-      merge_type = local.default_cloud_init_merge_type
+      )
+      filename     = "50-oke-ubuntu.sh"
+      merge_type   = local.default_cloud_init_merge_type
     }
   }
 
@@ -184,7 +173,7 @@ data "cloudinit_config" "workers" {
     precondition {
       condition = lookup(local.ubuntu_worker_pools, each.key, null) == null || (
         lookup(local.ubuntu_worker_pools, each.key, null) != null &&
-          contains(local.ubuntu_supported_versions, lookup(lookup(local.ubuntu_worker_pools, each.key, {}), "ubuntu_release", ""))
+          contains(keys(local.ubuntu_supported_versions), lookup(lookup(local.ubuntu_worker_pools, each.key, {}), "ubuntu_release", ""))
       )
       error_message = <<-EOT
       Supported Ubuntu versions are "22.04" and "24.04".

modules/workers/locals.tf

@@ -293,7 +293,12 @@ locals {
 
   # Map of nodepools using Ubuntu images.
 
-  ubuntu_supported_versions = ["22.04", "24.04", "22.04 Minimal", "24.04 Minimal"]
+  ubuntu_supported_versions = {
+    "22.04" = "jammy"
+    "24.04" = "noble"
+    "22.04 Minimal" = "jammy"
+    "24.04 Minimal" = "nobble"
+  }
 
   ubuntu_worker_pools = {
     for k, v in local.enabled_worker_pools : k => {