Commit 1db39af0 authored by Chris Merrett's avatar Chris Merrett

Unbelievably, issue #13389 still isn't fixed. Back to string comparison...

parent ac09ef0a
Pipeline #4959 passed with stage
in 16 seconds
...@@ -33,7 +33,7 @@ variable "enable_dns_support" { ...@@ -33,7 +33,7 @@ variable "enable_dns_support" {
variable "enable_eks_support" { variable "enable_eks_support" {
description = "When set to true, properly tags VPC assets with proper discovery assets" description = "When set to true, properly tags VPC assets with proper discovery assets"
default = false default = "false"
} }
variable "eks_cluster_name" { variable "eks_cluster_name" {
...@@ -45,7 +45,7 @@ resource "aws_vpc" "mod" { ...@@ -45,7 +45,7 @@ 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}" : "${var.name},shared")))}"
} }
resource "aws_subnet" "public" { resource "aws_subnet" "public" {
...@@ -74,7 +74,7 @@ resource "aws_subnet" "private" { ...@@ -74,7 +74,7 @@ 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}.private.${element(var.availability_zones, count.index)}" : "${var.name}.private.${element(var.availability_zones, count.index)},shared")))}"
} }
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