first possibly valid setup

Signed-off-by: David van der Spek <[email protected]>
pluralsh · Sep 7, 2023 · 145abf6 · 145abf6
1 parent 83daf6a
commit 145abf6
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 5 deletions.
diff --git a/bootstrap/terraform/aws-bootstrap/existing.tf b/bootstrap/terraform/aws-bootstrap/existing.tf
@@ -20,8 +20,8 @@ data "aws_eks_node_group" "cluster" {
 }
 
 data "aws_subnet" "cluster_subnets" {
-  count = var.create_cluster ? 0 : length(one(data.aws_eks_cluster.test_cluster[*].vpc_config[0].subnet_ids))
-  id    = tolist(one(data.aws_eks_cluster.test_cluster[*].vpc_config[0].subnet_ids))[count.index]
+  count = var.create_cluster ? 0 : length(one(data.aws_eks_cluster.cluster[*].vpc_config[0].subnet_ids))
+  id    = tolist(one(data.aws_eks_cluster.cluster[*].vpc_config[0].subnet_ids))[count.index]
 }
 
 

diff --git a/bootstrap/terraform/aws-bootstrap/locals.tf b/bootstrap/terraform/aws-bootstrap/locals.tf
@@ -3,7 +3,7 @@ locals {
   create_vpc                = var.create_cluster && var.create_vpc ? true : false
   vpc_id                    = var.create_cluster ? one(module.vpc[*].vpc_id) : one(data.aws_eks_cluster.cluster[*].vpc_config[0].vpc_id)
   cluster_id                = var.create_cluster ? one(module.cluster[*].cluster_id) : one(data.aws_eks_cluster.cluster[*].id)
-  cluster_config            = var.create_cluster ? one(module.cluster[*].config_map_aws_auth) : {}
+  cluster_config            = try(var.create_cluster ? one(module.cluster[*].config_map_aws_auth) : tomap(false), {})
   cluster_oidc_issuer_url   = var.create_cluster ? one(module.cluster[*].cluster_oidc_issuer_url) : one(data.aws_eks_cluster.cluster[*].identity[0].oidc.0.issuer)
   cluster_endpoint          = var.create_cluster ? one(module.cluster[*].cluster_endpoint) : one(data.aws_eks_cluster.cluster[*].endpoint)
 }

diff --git a/bootstrap/terraform/aws-bootstrap/moved.tf b/bootstrap/terraform/aws-bootstrap/moved.tf
@@ -0,0 +1,39 @@
+moved {
+  from = module.cluster
+  to   = module.cluster[0]
+}
+
+moved {
+  from = module.vpc
+  to   = module.vpc[0]
+}
+
+moved {
+  from = module.single_az_node_groups
+  to   = module.single_az_node_groups[0]
+}
+
+moved {
+  from = module.multi_az_node_groups
+  to   = module.multi_az_node_groups[0]
+}
+
+moved {
+  from = aws_eks_addon.vpc_cni
+  to   = aws_eks_addon.vpc_cni[0]
+}
+
+moved {
+  from = aws_eks_addon.core_dns
+  to   = aws_eks_addon.core_dns[0]
+}
+
+moved {
+  from = aws_eks_addon.kube_proxy
+  to   = aws_eks_addon.kube_proxy[0]
+}
+
+moved {
+  from = kubernetes_namespace.bootstrap
+  to   = kubernetes_namespace.bootstrap[0]
+}
diff --git a/bootstrap/terraform/aws-bootstrap/output.tf b/bootstrap/terraform/aws-bootstrap/output.tf
@@ -39,7 +39,7 @@ output "worker_role_arn" {
 }
 
 output "node_groups" {
-  value = var.create_cluster ? [for d in merge(one(module.single_az_node_groups[*].node_groups), one(module.multi_az_node_groups[*].node_groups)): d] : {}
+  value = try(var.create_cluster ? [for d in merge(one(module.single_az_node_groups[*].node_groups), one(module.multi_az_node_groups[*].node_groups)): d] : tomap(false), {})
 }
 
 output "vpc" {
@@ -52,7 +52,7 @@ output "vpc_cidr" {
 
 
 output "cluster" {
-  value =  var.create_cluster ? one(module.cluster[*]) : (data.aws_eks_cluster.cluster[*])
+  value =  try(var.create_cluster ? one(module.cluster[*]) : tomap(false), one(data.aws_eks_cluster.cluster[*]))
 }
 
 output "cluster_service_ipv4_cidr" {