From 9ed402834a88ac6f4d45f653616114813d41aab3 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Thu, 17 Oct 2024 09:43:37 -0700 Subject: [PATCH 1/2] Enables ami deprecation timeframe, available to ebssurrogate in amazon plugin v1.3.3 --- spel/minimal-linux.pkr.hcl | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/spel/minimal-linux.pkr.hcl b/spel/minimal-linux.pkr.hcl index 5009ae64..b870792f 100644 --- a/spel/minimal-linux.pkr.hcl +++ b/spel/minimal-linux.pkr.hcl @@ -6,7 +6,7 @@ packer { required_plugins { amazon = { source = "github.com/hashicorp/amazon" - version = ">= 1.3.1" + version = ">= 1.3.3" } azure = { source = "github.com/hashicorp/azure" @@ -687,12 +687,10 @@ source "amazon-ebssurrogate" "base" { ami_virtualization_type = "hvm" associate_public_ip_address = true communicator = "ssh" - # Not yet supported for ebssurrogate builder, see: - # * https://github.com/hashicorp/packer-plugin-amazon/issues/478 - # deprecate_at = local.aws_ami_deprecate_at - ena_support = true - force_deregister = var.aws_force_deregister - instance_type = var.aws_instance_type + deprecate_at = local.aws_ami_deprecate_at + ena_support = true + force_deregister = var.aws_force_deregister + instance_type = var.aws_instance_type launch_block_device_mappings { delete_on_termination = true device_name = "/dev/sda1" From 0408ccc6ca9592b4dc559cb5de8e146f635f5432 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Thu, 17 Oct 2024 09:45:45 -0700 Subject: [PATCH 2/2] Updates virtualbox pin to version compatible with v6 --- spel/minimal-linux.pkr.hcl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/spel/minimal-linux.pkr.hcl b/spel/minimal-linux.pkr.hcl index b870792f..a5c03b1b 100644 --- a/spel/minimal-linux.pkr.hcl +++ b/spel/minimal-linux.pkr.hcl @@ -21,10 +21,8 @@ packer { version = "~> 1" } virtualbox = { - # Pinned to 1.0.0 to workaround https://github.com/hashicorp/packer-plugin-virtualbox/issues/139 - # When virtualbox 7.0 is available in ubuntu repositories, we can revisit source = "github.com/hashicorp/virtualbox" - version = "~> 1.0.0" + version = ">= 1.1.1" } } }