templates(al23): pass build image for nodeadm

doc/usage/al2023.md

@@ -5,7 +5,6 @@
 <!-- template-variable-table-boundary -->
 | Variable | Description |
 | - | - |
-| `enable_accelerator` | Vendor that provides the GPU or accelerator hardware. Currently we support Neuron and NVIDIA. |
 | `ami_component_description` |  |
 | `ami_description` |  |
 | `ami_name` |  |
@@ -21,15 +20,17 @@
 | `binary_bucket_region` |  |
 | `containerd_version` |  |
 | `creator` |  |
+| `enable_accelerator` | Vendor that provides the GPU or accelerator hardware. Currently we support Neuron and NVIDIA. |
+| `enable_efa` | Valid options are ```true``` or ```false```. Wheather or not to install the software needed to use AWS Elastic Fabric Adapter (EFA) network interfaces. |
 | `enable_fips` | Install openssl and enable fips related kernel parameters |
 | `encrypted` |  |
 | `iam_instance_profile` | The name of an IAM instance profile to launch the EC2 instance with. |
-| `enable_efa` | Valid options are ```true``` or ```false```. Wheather or not to install the software needed to use AWS Elastic Fabric Adapter (EFA) network interfaces. |
 | `instance_type` |  |
 | `kms_key_id` |  |
 | `kubernetes_build_date` |  |
 | `kubernetes_version` |  |
 | `launch_block_device_mappings_volume_size` |  |
+| `nodeadm_build_image` | Image to use as a build environment for nodeadm |
 | `nvidia_driver_major_version` | To be used only when ```enable_accelerator = nvidia```. Driver version to install, depends on what is available in NVIDIA repository. |
 | `remote_folder` | Directory path for shell provisioner scripts on the builder instance |
 | `runc_version` |  |

templates/al2023/provisioners/install-nodeadm.sh

@@ -4,8 +4,6 @@ set -o pipefail
 set -o nounset
 set -o errexit
 
-BUILD_IMAGE=public.ecr.aws/eks-distro-build-tooling/golang:1.22
-
 sudo systemctl start containerd
 
 sudo nerdctl run \

templates/al2023/template.json

@@ -1,7 +1,6 @@
 {
   "_comment": "All template variables are enumerated here; and most variables have a default value defined in a variables.json for each kubernetes minor version",
   "variables": {
-    "enable_accelerator": null,
     "ami_component_description": null,
     "ami_description": null,
     "ami_name": null,
@@ -17,15 +16,17 @@
     "binary_bucket_region": null,
     "containerd_version": null,
     "creator": null,
+    "enable_accelerator": null,
+    "enable_efa": null,
     "enable_fips": null,
     "encrypted": null,
     "iam_instance_profile": null,
-    "enable_efa": null,
     "instance_type": null,
     "kms_key_id": null,
     "kubernetes_build_date": null,
     "kubernetes_version": null,
     "launch_block_device_mappings_volume_size": null,
+    "nodeadm_build_image": null,
     "nvidia_driver_major_version": null,
     "remote_folder": null,
     "runc_version": null,
@@ -211,6 +212,7 @@
       "remote_folder": "{{ user `remote_folder`}}",
       "script": "{{template_dir}}/provisioners/install-nodeadm.sh",
       "environment_vars": [
+        "BUILD_IMAGE={{user `nodeadm_build_image`}}",
         "PROJECT_DIR={{user `working_dir`}}/nodeadm"
       ]
     },

templates/al2023/variables-default.json

@@ -1,5 +1,4 @@
 {
-    "enable_accelerator": "",
     "ami_component_description": "(k8s: {{ user `kubernetes_version` }}, containerd: {{ user `containerd_version` }})",
     "ami_description": "EKS-optimized Kubernetes node based on Amazon Linux 2023",
     "ami_regions": "",
@@ -13,12 +12,14 @@
     "binary_bucket_region": "us-west-2",
     "containerd_version": "1.7.11-*",
     "creator": "{{env `USER`}}",
+    "enable_accelerator": "",
+    "enable_efa": "false",
     "enable_fips": "false",
     "encrypted": "false",
-    "kms_key_id": "",
     "iam_instance_profile": "",
-    "enable_efa": "false",
+    "kms_key_id": "",
     "launch_block_device_mappings_volume_size": "20",
+    "nodeadm_build_image": "public.ecr.aws/eks-distro-build-tooling/golang:1.23",
     "nvidia_driver_major_version": "555",
     "remote_folder": "/tmp",
     "runc_version": "*",