Remove Deprecated CoreOS from AWS terraform

assets/terraform-modules/aws/flatcar-linux/kubernetes/ami.tf

@@ -1,37 +1,11 @@
 locals {
-  # Pick a Container Linux derivative
-  ami_id = "${element(concat(data.aws_ami.flatcar.*.image_id, data.aws_ami.coreos.*.image_id, list("")), 0)}"
+  ami_id = data.aws_ami.flatcar.*.image_id
 
-  flavor  = var.os_name
   channel = var.os_channel
   ver     = var.os_version == "current" ? "" : var.os_version
 }
 
-data "aws_ami" "coreos" {
-  count = "${local.flavor == "coreos" ? 1 : 0}"
-
-  most_recent = true
-  owners      = ["595879546273"]
-
-  filter {
-    name   = "architecture"
-    values = ["x86_64"]
-  }
-
-  filter {
-    name   = "virtualization-type"
-    values = ["hvm"]
-  }
-
-  filter {
-    name   = "name"
-    values = ["CoreOS-${local.channel}-${local.ver}*"]
-  }
-}
-
 data "aws_ami" "flatcar" {
-  count = "${local.flavor == "flatcar" ? 1 : 0}"
-
   most_recent = true
   owners      = ["075585003325"]
 

assets/terraform-modules/aws/flatcar-linux/kubernetes/variables.tf

@@ -41,12 +41,6 @@ variable "controller_type" {
   description = "EC2 instance type for controllers"
 }
 
-variable "os_name" {
-  type        = string
-  default     = "flatcar"
-  description = "Name of Operating System (coreos or flatcar)"
-}
-
 variable "os_channel" {
   type        = string
   default     = "stable"

assets/terraform-modules/aws/flatcar-linux/kubernetes/workers/ami.tf

@@ -1,37 +1,11 @@
 locals {
-  # Pick a Container Linux derivative
-  ami_id = "${element(concat(data.aws_ami.flatcar.*.image_id, data.aws_ami.coreos.*.image_id, list("")), 0)}"
+  ami_id = data.aws_ami.flatcar.*.image_id
 
-  flavor  = var.os_name
   channel = var.os_channel
   ver     = var.os_version == "current" ? "" : var.os_version
 }
 
-data "aws_ami" "coreos" {
-  count = "${local.flavor == "coreos" ? 1 : 0}"
-
-  most_recent = true
-  owners      = ["595879546273"]
-
-  filter {
-    name   = "architecture"
-    values = ["x86_64"]
-  }
-
-  filter {
-    name   = "virtualization-type"
-    values = ["hvm"]
-  }
-
-  filter {
-    name   = "name"
-    values = ["CoreOS-${local.channel}-${local.ver}*"]
-  }
-}
-
 data "aws_ami" "flatcar" {
-  count = "${local.flavor == "flatcar" ? 1 : 0}"
-
   most_recent = true
   owners      = ["075585003325"]
 

assets/terraform-modules/aws/flatcar-linux/kubernetes/workers/variables.tf

@@ -51,12 +51,6 @@ variable "taints" {
   description = "Map of custom taints for worker nodes."
 }
 
-variable "os_name" {
-  type        = string
-  default     = "flatcar"
-  description = "Name of Operating System (coreos or flatcar)"
-}
-
 variable "os_channel" {
   type        = string
   default     = "stable"

assets/terraform-modules/azure/flatcar-linux/kubernetes/versions.tf

@@ -5,7 +5,7 @@ terraform {
 
   required_providers {
     ct = {
-      source = "poseidon/ct"
+      source  = "poseidon/ct"
       version = "0.7.1"
     }
     azurerm = {

assets/terraform-modules/azure/flatcar-linux/kubernetes/workers/versions.tf

@@ -3,7 +3,7 @@ terraform {
 
   required_providers {
     ct = {
-      source = "poseidon/ct"
+      source  = "poseidon/ct"
       version = "0.7.1"
     }
     azurerm = {