fix: Upgrade Amazon base AMI to Amazon Linux 2 kernel 5x (#1812)

npalm · web-flow · commit 9aa5532e6e9d · 2022-03-09T13:01:13.000+01:00
diff --git a/images/linux-amzn2/github_agent.linux.pkr.hcl b/images/linux-amzn2/github_agent.linux.pkr.hcl
@@ -81,7 +81,7 @@ source "amazon-ebs" "githubrunner" {
   associate_public_ip_address = var.associate_public_ip_address
   source_ami_filter {
     filters = {
-      name                = "amzn2-ami-hvm-2.*-x86_64-ebs"
+      name                = "amzn2-ami-kernel-5.*-hvm-*-x86_64-gp2"
       root-device-type    = "ebs"
       virtualization-type = "hvm"
     }
diff --git a/modules/runners/main.tf b/modules/runners/main.tf
@@ -16,7 +16,7 @@ locals {
 
   default_ami = {
     "windows" = { name = ["Windows_Server-20H2-English-Core-ContainersLatest-*"] }
-    "linux"   = var.runner_architecture == "arm64" ? { name = ["amzn2-ami-hvm-2*-arm64-gp2"] } : { name = ["amzn2-ami-hvm-2.*-x86_64-ebs"] }
+    "linux"   = var.runner_architecture == "arm64" ? { name = ["amzn2-ami-kernel-5.*-hvm-*-arm64-gp2"] } : { name = ["amzn2-ami-kernel-5.*-hvm-*-x86_64-gp2"] }
   }
 
   default_userdata_template = {

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ source "amazon-ebs" "githubrunner" {`
`81`	`81`	`associate_public_ip_address = var.associate_public_ip_address`
`82`	`82`	`source_ami_filter {`
`83`	`83`	`filters = {`
`84`		`- name = "amzn2-ami-hvm-2.*-x86_64-ebs"`
	`84`	`+ name = "amzn2-ami-kernel-5.-hvm--x86_64-gp2"`
`85`	`85`	`root-device-type = "ebs"`
`86`	`86`	`virtualization-type = "hvm"`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ locals {`
`16`	`16`
`17`	`17`	`default_ami = {`
`18`	`18`	`"windows" = { name = ["Windows_Server-20H2-English-Core-ContainersLatest-*"] }`
`19`		`- "linux" = var.runner_architecture == "arm64" ? { name = ["amzn2-ami-hvm-2-arm64-gp2"] } : { name = ["amzn2-ami-hvm-2.-x86_64-ebs"] }`
	`19`	`+ "linux" = var.runner_architecture == "arm64" ? { name = ["amzn2-ami-kernel-5.-hvm--arm64-gp2"] } : { name = ["amzn2-ami-kernel-5.-hvm--x86_64-gp2"] }`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`default_userdata_template = {`