Commit e2e9c187 authored by Danny Burke's avatar Danny Burke

Try addtional tagging for subnets

parent 4eb5d32b
Pipeline #8126 passed with stage
in 17 seconds
...@@ -46,7 +46,12 @@ resource "aws_vpc" "mod" { ...@@ -46,7 +46,12 @@ resource "aws_vpc" "mod" {
enable_dns_hostnames = "${var.enable_dns_hostnames}" enable_dns_hostnames = "${var.enable_dns_hostnames}"
enable_dns_support = "${var.enable_dns_support}" enable_dns_support = "${var.enable_dns_support}"
tags = "${zipmap(compact(split(",", var.enable_eks_support == "false" ? "Name" : "Name,kubernetes.io/cluster/${var.eks_cluster_name}")), compact(split(",", var.enable_eks_support == "false" ? "${var.name}" : "${var.name},shared")))}" //tags = "${zipmap(compact(split(",", var.enable_eks_support == "false" ? "Name" : "Name,kubernetes.io/cluster/${var.eks_cluster_name}")), compact(split(",", var.enable_eks_support == "false" ? "${var.name}.public.${element(var.availability_zones, count.index)}" : "${var.name}.public.${element(var.availability_zones, count.index)},shared")))}"
tags {
Name = "${var.name}.public.${element(var.availability_zones, count.index)}"
"kubernetes.io/cluster/${var.eks_cluster_name}" = "shared"
"kubernetes.io/role/eks-alb-ingress-controller" = 1
}
} }
resource "aws_subnet" "public" { resource "aws_subnet" "public" {
...@@ -60,7 +65,12 @@ resource "aws_subnet" "public" { ...@@ -60,7 +65,12 @@ resource "aws_subnet" "public" {
count = "${length(var.public_subnets)}" count = "${length(var.public_subnets)}"
map_public_ip_on_launch = true map_public_ip_on_launch = true
tags = "${zipmap(compact(split(",", var.enable_eks_support == "false" ? "Name" : "Name,kubernetes.io/cluster/${var.eks_cluster_name}")), compact(split(",", var.enable_eks_support == "false" ? "${var.name}.public.${element(var.availability_zones, count.index)}" : "${var.name}.public.${element(var.availability_zones, count.index)},shared")))}" //tags = "${zipmap(compact(split(",", var.enable_eks_support == "false" ? "Name" : "Name,kubernetes.io/cluster/${var.eks_cluster_name}")), compact(split(",", var.enable_eks_support == "false" ? "${var.name}.public.${element(var.availability_zones, count.index)}" : "${var.name}.public.${element(var.availability_zones, count.index)},shared")))}"
tags {
Name = "${var.name}.public.${element(var.availability_zones, count.index)}"
"kubernetes.io/cluster/${var.eks_cluster_name}" = "shared"
"kubernetes.io/role/eks-alb-ingress-controller" = 1
}
} }
resource "aws_subnet" "private" { resource "aws_subnet" "private" {
...@@ -73,7 +83,12 @@ resource "aws_subnet" "private" { ...@@ -73,7 +83,12 @@ resource "aws_subnet" "private" {
availability_zone = "${element(var.availability_zones, count.index)}" availability_zone = "${element(var.availability_zones, count.index)}"
count = "${length(var.private_subnets)}" count = "${length(var.private_subnets)}"
tags = "${zipmap(compact(split(",", var.enable_eks_support == "false" ? "Name" : "Name,kubernetes.io/cluster/${var.eks_cluster_name}")), compact(split(",", var.enable_eks_support == "false" ? "${var.name}.private.${element(var.availability_zones, count.index)}" : "${var.name}.private.${element(var.availability_zones, count.index)},shared")))}" //tags = "${zipmap(compact(split(",", var.enable_eks_support == "false" ? "Name" : "Name,kubernetes.io/cluster/${var.eks_cluster_name}")), compact(split(",", var.enable_eks_support == "false" ? "${var.name}.public.${element(var.availability_zones, count.index)}" : "${var.name}.public.${element(var.availability_zones, count.index)},shared")))}"
tags {
Name = "${var.name}.public.${element(var.availability_zones, count.index)}"
"kubernetes.io/cluster/${var.eks_cluster_name}" = "shared"
"kubernetes.io/role/eks-alb-ingress-controller" = 1
}
} }
resource "aws_internet_gateway" "mod" { resource "aws_internet_gateway" "mod" {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment