From 6ab0808f4d3f37ac9c55027cc8db3dd84da22a47 Mon Sep 17 00:00:00 2001
From: Carter <mckdev@amazon.com>
Date: Fri, 7 Jul 2023 15:17:22 -0700
Subject: [PATCH] Generate version info for cached images only when  is active
 (#1341)

---
 eks-worker-al2.json              | 5 ++++-
 scripts/generate-version-info.sh | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/eks-worker-al2.json b/eks-worker-al2.json
index c9385ddc6..75ea08830 100644
--- a/eks-worker-al2.json
+++ b/eks-worker-al2.json
@@ -204,7 +204,10 @@
       "type": "shell",
       "remote_folder": "{{ user `remote_folder`}}",
       "script": "{{template_dir}}/scripts/generate-version-info.sh",
-      "execute_command": "chmod +x {{ .Path }}; {{ .Path }} {{user `working_dir`}}/version-info.json"
+      "execute_command": "chmod +x {{ .Path }}; {{ .Path }} {{user `working_dir`}}/version-info.json",
+      "environment_vars": [
+        "CACHE_CONTAINER_IMAGES={{user `cache_container_images`}}"
+      ]
     },
     {
       "type": "file",
diff --git a/scripts/generate-version-info.sh b/scripts/generate-version-info.sh
index 9a52f42ce..3f75cc01d 100644
--- a/scripts/generate-version-info.sh
+++ b/scripts/generate-version-info.sh
@@ -20,4 +20,9 @@ echo $(jq ".binaries.kubelet = \"$(kubelet --version | awk '{print $2}')\"" $OUT
 echo $(jq ".binaries.awscli = \"$(aws --version | awk '{print $1}' | cut -d '/' -f 2)\"" $OUTPUT_FILE) > $OUTPUT_FILE
 
 # cached images
-echo $(jq ".images = [ $(sudo ctr -n k8s.io image ls -q | cut -d'/' -f2- | sort | uniq | grep -v 'sha256' | xargs -r printf "\"%s\"," | sed 's/,$//') ]" $OUTPUT_FILE) > $OUTPUT_FILE
+if systemctl is-active --quiet containerd; then
+  echo $(jq ".images = [ $(sudo ctr -n k8s.io image ls -q | cut -d'/' -f2- | sort | uniq | grep -v 'sha256' | xargs -r printf "\"%s\"," | sed 's/,$//') ]" $OUTPUT_FILE) > $OUTPUT_FILE
+elif [ "${CACHE_CONTAINER_IMAGES}" = "true" ]; then
+  echo "containerd must be active to generate version info for cached images"
+  exit 1
+fi