strip out the unneeded caching logic

awslabs · Oct 10, 2024 · 0a92684 · 0a92684
1 parent f4c00a6
commit 0a92684
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 126 deletions.
diff --git a/nodeadm/cmd/nodeadm/init/init.go b/nodeadm/cmd/nodeadm/init/init.go
@@ -164,7 +164,7 @@ func enrichConfig(log *zap.Logger, cfg *api.NodeConfig) error {
 	log.Info("Instance details populated", zap.Reflect("details", instanceDetails))
 	log.Info("Fetching default options...")
 	cfg.Status.Defaults = api.DefaultOptions{
-		SandboxImage: containerd.PauseContainerImageRef,
+		SandboxImage: "localhost/kubernetes/pause:0.1.0",
 	}
 	log.Info("Default options populated", zap.Reflect("defaults", cfg.Status.Defaults))
 	return nil

diff --git a/nodeadm/internal/containerd/daemon.go b/nodeadm/internal/containerd/daemon.go
@@ -28,7 +28,7 @@ func (cd *containerd) EnsureRunning() error {
 }
 
 func (cd *containerd) PostLaunch(c *api.NodeConfig) error {
-	return cacheSandboxImage(c)
+	return nil
 }
 
 func (cd *containerd) Name() string {

diff --git a/nodeadm/internal/containerd/sandbox.go b/nodeadm/internal/containerd/sandbox.go
diff --git a/nodeadm/internal/containerd/sandbox_test.go b/nodeadm/internal/containerd/sandbox_test.go
diff --git a/templates/al2/provisioners/cache-pause-container.sh b/templates/al2/provisioners/cache-pause-container.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -o nounset
+set -o errexit
+set -o pipefail
+
+AWS_DOMAIN=$(imds 'latest/meta-data/services/domain')
+ECR_URI="$(/etc/eks/get-ecr-uri.sh ${AWS_REGION} ${AWS_DOMAIN})"
+cache-pause-container "${ECR_URI}/eks/pause:3.5"
diff --git a/templates/al2/template.json b/templates/al2/template.json
@@ -211,13 +211,12 @@
     {
       "type": "shell",
       "remote_folder": "{{ user `remote_folder`}}",
-      "script": "{{template_dir}}/../shared/provisioners/cache-pause-container.sh",
+      "script": "{{template_dir}}/provisioners/cache-pause-container.sh",
       "environment_vars": [
         "AWS_ACCESS_KEY_ID={{user `aws_access_key_id`}}",
         "AWS_SECRET_ACCESS_KEY={{user `aws_secret_access_key`}}",
         "AWS_SESSION_TOKEN={{user `aws_session_token`}}",
-        "AWS_REGION={{user `aws_region`}}",
-        "PAUSE_CONTAINER_CMD=echo $(/etc/eks/get-ecr-uri.sh \"{{user `aws_region`}}\" \"$(imds 'latest/meta-data/services/domain')\")/eks/pause:3.5"
+        "AWS_REGION={{user `aws_region`}}"
       ]
     },
     {

diff --git a/templates/al2023/provisioners/cache-pause-container.sh b/templates/al2023/provisioners/cache-pause-container.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -o nounset
+set -o errexit
+set -o pipefail
+
+cache-pause-container "$(nodeadm runtime ecr-uri)/eks/pause:3.5"
diff --git a/templates/al2023/template.json b/templates/al2023/template.json
@@ -220,13 +220,12 @@
     {
       "type": "shell",
       "remote_folder": "{{ user `remote_folder`}}",
-      "script": "{{template_dir}}/../shared/provisioners/cache-pause-container.sh",
+      "script": "{{template_dir}}/provisioners/cache-pause-container.sh",
       "environment_vars": [
         "AWS_ACCESS_KEY_ID={{user `aws_access_key_id`}}",
         "AWS_SECRET_ACCESS_KEY={{user `aws_secret_access_key`}}",
         "AWS_SESSION_TOKEN={{user `aws_session_token`}}",
-        "AWS_REGION={{user `aws_region`}}",
-        "PAUSE_CONTAINER_CMD=echo $(nodeadm runtime ecr-uri)/eks/pause:3.5"
+        "AWS_REGION={{user `aws_region`}}"
       ]
     },
     {

diff --git a/...red/provisioners/cache-pause-container.sh → .../shared/runtime/bin/cache-pause-container b/...red/provisioners/cache-pause-container.sh → .../shared/runtime/bin/cache-pause-container
@@ -4,8 +4,8 @@ set -o nounset
 set -o errexit
 set -o pipefail
 
-LOCAL_REF=${LOCAL_REF:-"localhost/kubernetes/pause:0.1.0"}
-PAUSE_CONTAINER=${PAUSE_CONTAINER:-$(eval "${PAUSE_CONTAINER_CMD}")}
+PAUSE_CONTAINER=${1}
+LOCAL_REF=${2:-"localhost/kubernetes/pause:0.1.0"}
 
 sudo systemctl start containerd