Merge pull request #129 from cisagov/improvement/upgrade-base-ami-to-fedora-40

Upgrade the base AMI to Fedora 42

Author: jsf9k

.pre-commit-config.yaml

@@ -200,6 +200,9 @@ repos:
           # It is also a good idea to go ahead and upgrade to version
           # 10 since version 9 is going EOL at the end of November:
           # https://endoflife.date/ansible
+          #
+          # This project uses community.general.ufw, which is packaged
+          # into ansible, so it requires this dependency.
           - ansible>=10,<11
           # ansible-core 2.16.3 through 2.16.6 suffer from the bug
           # discussed in ansible/ansible#82702, which breaks any

ami_arm64.pkr.hcl

@@ -15,7 +15,7 @@ source "amazon-ebs" "arm64" {
   region             = var.build_region
   region_kms_key_ids = var.region_kms_keys
   skip_create_ami    = var.skip_create_ami
-  source_ami         = data.amazon-ami.fedora_39_arm64.id
+  source_ami         = data.amazon-ami.fedora_42_arm64.id
   ssh_username       = "fedora"
   subnet_filter {
     filters = {
@@ -25,11 +25,11 @@ source "amazon-ebs" "arm64" {
   tags = {
     Application        = "FreeIPA server"
     Architecture       = "arm64"
-    Base_AMI_Name      = data.amazon-ami.fedora_39_arm64.name
+    Base_AMI_Name      = data.amazon-ami.fedora_42_arm64.name
     GitHub_Ref_Name    = var.github_ref_name
     GitHub_Release_URL = var.release_url
     GitHub_SHA         = var.github_sha
-    OS_Version         = "Fedora 39"
+    OS_Version         = "Fedora 42"
     Pre_Release        = var.is_prerelease
     Release            = var.release_tag
     Team               = "VM Fusion - Development"

ami_x86_64.pkr.hcl

@@ -15,7 +15,7 @@ source "amazon-ebs" "x86_64" {
   region             = var.build_region
   region_kms_key_ids = var.region_kms_keys
   skip_create_ami    = var.skip_create_ami
-  source_ami         = data.amazon-ami.fedora_39_x86_64.id
+  source_ami         = data.amazon-ami.fedora_42_x86_64.id
   ssh_username       = "fedora"
   subnet_filter {
     filters = {
@@ -25,11 +25,11 @@ source "amazon-ebs" "x86_64" {
   tags = {
     Application        = "FreeIPA server"
     Architecture       = "x86_64"
-    Base_AMI_Name      = data.amazon-ami.fedora_39_x86_64.name
+    Base_AMI_Name      = data.amazon-ami.fedora_42_x86_64.name
     GitHub_Ref_Name    = var.github_ref_name
     GitHub_Release_URL = var.release_url
     GitHub_SHA         = var.github_sha
-    OS_Version         = "Fedora 39"
+    OS_Version         = "Fedora 42"
     Pre_Release        = var.is_prerelease
     Release            = var.release_tag
     Team               = "VM Fusion - Development"

base_amis.pkr.hcl

@@ -1,7 +1,7 @@
-data "amazon-ami" "fedora_39_arm64" {
+data "amazon-ami" "fedora_42_arm64" {
   filters = {
     architecture        = "arm64"
-    name                = "Fedora-Cloud-Base-39-*aarch64-hvm-*-gp3-*"
+    name                = "Fedora-Cloud-Base-AmazonEC2.aarch64-42-*"
     root-device-type    = "ebs"
     virtualization-type = "hvm"
   }
@@ -10,10 +10,10 @@ data "amazon-ami" "fedora_39_arm64" {
   region      = var.build_region
 }
 
-data "amazon-ami" "fedora_39_x86_64" {
+data "amazon-ami" "fedora_42_x86_64" {
   filters = {
     architecture        = "x86_64"
-    name                = "Fedora-Cloud-Base-39-*x86_64-hvm-*-gp3-*"
+    name                = "Fedora-Cloud-Base-AmazonEC2.x86_64-42-*"
     root-device-type    = "ebs"
     virtualization-type = "hvm"
   }

version.txt

@@ -1 +1 @@
-0.9.5+build.2
+0.10.0