Allow to add custom tags to subnets, and remove unused Public tag

main.tf

@@ -54,15 +54,15 @@ resource "aws_subnet" "quortex" {
   tags = merge(
     {
       "Name"                                      = "${var.subnet_name_prefix}${each.key}",
-      "Public"                                    = "true",
       "kubernetes.io/cluster/${var.cluster_name}" = "shared",
     },
     each.value.public ? {
       "kubernetes.io/role/elb" = "1" # tagged so that Kubernetes knows to use only those subnets for external load balancers
       } : {
       "kubernetes.io/role/internal-elb" = "1"
     },
-    var.tags
+    var.tags,
+    each.value.tags
   )
 
   depends_on = [aws_vpc_ipv4_cidr_block_association.secondary]

variables.tf

@@ -71,11 +71,11 @@ variable "vpc_cidr_block" {
 }
 
 variable "subnets" {
-  type        = map(object({ availability_zone = string, cidr = string, public = bool }))
+  type        = map(object({ availability_zone = string, cidr = string, public = bool, tags = optional(map(string), {}) }))
   description = <<EOT
 A map representing the subnets that need to be created. Each item should
-specify the subnet's Availability Zone, cidr block, and whether the subnet
-should be public or not.
+specify the subnet's Availability Zone, cidr block, whether the subnet
+should be public or not and optionally extra tags to add.
 EOT
 }
 

versions.tf

@@ -15,7 +15,7 @@
  */
 
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 1.3.0"
 
   required_providers {
     aws = {