Introduce new variable for EBS CSI driver version to decouple it from…

… Agent version
aws · Nov 17, 2023 · a14c3c5 · a14c3c5
1 parent 598499e
commit a14c3c5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 3 deletions.
diff --git a/al2.pkr.hcl b/al2.pkr.hcl
@@ -141,7 +141,7 @@ build {
     script = "scripts/install-managed-daemons.sh"
     environment_vars = [
       "REGION=${var.region}",
-      "AGENT_VERSION=${var.ecs_agent_version}",
+      "CSI_DRIVER_VERSION=${var.csi_driver_version}",
       "AIR_GAPPED=${var.air_gapped}",
       "MANAGED_DAEMON_BASE_URL=${var.managed_daemon_base_url}"
     ]

diff --git a/al2023.pkr.hcl b/al2023.pkr.hcl
@@ -109,7 +109,7 @@ build {
     script = "scripts/install-managed-daemons.sh"
     environment_vars = [
       "REGION=${var.region}",
-      "AGENT_VERSION=${var.ecs_agent_version}",
+      "CSI_DRIVER_VERSION=${var.csi_driver_version}",
       "AIR_GAPPED=${var.air_gapped}",
       "MANAGED_DAEMON_BASE_URL=${var.managed_daemon_base_url}"
     ]

diff --git a/generate-release-vars.sh b/generate-release-vars.sh
@@ -75,6 +75,7 @@ readonly ami_name_al2_kernel5dot10arm ami_name_al2_kernel5dot10 ami_name_al2_arm
 cat >|release.auto.pkrvars.hcl <<EOF
 ami_version          = "$ami_version"
 ecs_agent_version    = "$agent_version"
+csi_driver_version   = "$agent_version"
 ecs_init_rev         = "$ecs_init_rev"
 docker_version       = "20.10.25"
 docker_version_al2023 = "20.10.25"

diff --git a/release.auto.pkrvars.hcl b/release.auto.pkrvars.hcl
@@ -1,5 +1,6 @@
 ami_version                   = "20231103"
 ecs_agent_version             = "1.79.0"
+ebs_driver_version            = "1.79.0"
 ecs_init_rev                  = "1"
 docker_version                = "20.10.25"
 docker_version_al2023         = "20.10.25"

diff --git a/scripts/install-managed-daemons.sh b/scripts/install-managed-daemons.sh
@@ -165,7 +165,7 @@ case "$ARCH" in
 esac
 
 # Install CSI driver managed daemon
-CSI_DRIVER_FILENAME="ebs-csi-driver${ARCH_MOD}-v$AGENT_VERSION.tar"
+CSI_DRIVER_FILENAME="ebs-csi-driver${ARCH_MOD}-v$CSI_DRIVER_VERSION.tar"
 CSI_DRIVER_FULL_URL="${MANAGED_DAEMON_BASE_URL}${CSI_DRIVER_FILENAME}"
 
 curl -fLSs -o "$WORK_DIR/${CSI_DRIVER_FILENAME}" "$CSI_DRIVER_FULL_URL"

diff --git a/variables.pkr.hcl b/variables.pkr.hcl
@@ -46,6 +46,11 @@ variable "ecs_agent_version" {
   description = "ECS agent version to build AMI with."
 }
 
+variable "csi_driver_version" {
+  type        = string
+  description = "EBS CSI driver version to build AMI with."
+}
+
 variable "ecs_init_rev" {
   type        = string
   description = "ecs-init package version rev"