Default bastion to 20.04 (#78)

* change default ami_filter_value to select focal 20.04 * gcp
FairwindsOps · Apr 18, 2023 · 0f1c732 · 0f1c732
1 parent 988bc6c
commit 0f1c732
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/aws/auto-scaling.tf b/aws/auto-scaling.tf
@@ -2,7 +2,7 @@
 # replacing an unhealthy EC2 instance or recovering from an
 # availability zone failure.
 resource "aws_autoscaling_group" "bastion" {
-  # The Launch Configuration ID is part of the AUto Scalign Group name,
+  # The Launch Configuration ID is part of the Auto Scaling Group name,
   # to force the ASG and its EC2 to be recreated.
   name = "asg-${aws_launch_configuration.bastion.id}"
 

diff --git a/aws/inputs.tf b/aws/inputs.tf
@@ -99,7 +99,7 @@ variable "ami_owner_id_govcloud" {
 
 variable "ami_filter_value" {
   description = "The filter path for the AMI."
-  default     = "ubuntu/images/hvm-ssd/ubuntu-bionic-18.04-amd64-server-*"
+  default     = "ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*"
 }
 
 variable "arn_prefix" {

diff --git a/gcp/compute-image.tf b/gcp/compute-image.tf
@@ -1,4 +1,4 @@
-# This gets the latest AMI for Ubuntu 18.04
+# This gets the latest AMI for Ubuntu 20.04
 data "google_compute_image" "ubuntu" {
   # Ref: https://cloud.google.com/compute/docs/images
   family  = var.image_family

diff --git a/gcp/inputs.tf b/gcp/inputs.tf
@@ -104,7 +104,7 @@ variable "ssh_cidr_blocks" {
 
 variable "image_family" {
   description = "The family for the compute image. This module has assumptions about the OS being Ubuntu."
-  default     = "ubuntu-1804-lts"
+  default     = "ubuntu-2004-lts"
 }
 
 variable "image_project" {