add label aws_cluster_name

csantanapr · csantanapr · commit 7d76fe42d2fd · 2023-09-03T22:53:22.000-04:00
Signed-off-by: Carlos Santana &lt;csantana23@gmail.com&gt;
diff --git a/argocd/iac/terraform/examples/eks/aws-secrets-manager/main.tf b/argocd/iac/terraform/examples/eks/aws-secrets-manager/main.tf
@@ -90,7 +90,7 @@ locals {
     #enable_vpa                                   = true
     #enable_foo                                   = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set
   }
-  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })
+  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })
 
   addons_metadata = merge(
     module.eks_blueprints_addons.gitops_metadata,
diff --git a/argocd/iac/terraform/examples/eks/complete/main.tf b/argocd/iac/terraform/examples/eks/complete/main.tf
@@ -86,7 +86,7 @@ locals {
     enable_vpa                      = true
     enable_foo                      = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set
   }
-  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })
+  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })
 
   addons_metadata = merge(
     module.eks_blueprints_addons.gitops_metadata,
diff --git a/argocd/iac/terraform/examples/eks/crossplane/main.tf b/argocd/iac/terraform/examples/eks/crossplane/main.tf
@@ -93,7 +93,7 @@ locals {
     #enable_vpa                                   = true
     #enable_foo                                   = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set
   }
-  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })
+  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })
 
   addons_metadata = merge(
     module.eks_blueprints_addons.gitops_metadata,
diff --git a/argocd/iac/terraform/examples/eks/external-secrets/main.tf b/argocd/iac/terraform/examples/eks/external-secrets/main.tf
@@ -98,7 +98,7 @@ locals {
     #enable_vpa                                   = true
     #enable_foo                                   = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set
   }
-  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })
+  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })
 
   addons_metadata = merge(
     module.eks_blueprints_addons.gitops_metadata,
diff --git a/argocd/iac/terraform/examples/eks/hello-world/main.tf b/argocd/iac/terraform/examples/eks/hello-world/main.tf
@@ -87,7 +87,7 @@ locals {
     #enable_vpa                                   = true
     #enable_foo                                   = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set
   }
-  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })
+  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })
 
   addons_metadata = merge(
     module.eks_blueprints_addons.gitops_metadata,
diff --git a/argocd/iac/terraform/examples/eks/ingress-alb/main.tf b/argocd/iac/terraform/examples/eks/ingress-alb/main.tf
@@ -80,7 +80,7 @@ locals {
     #enable_aws_gateway_api_controller            = true
     #enable_aws_ebs_csi_resources                 = true # generate gp2 and gp3 storage classes for ebs-csi
     #enable_aws_secrets_store_csi_driver_provider = true
-    enable_aws_argocd_ingress = true
+    enable_aws_argocd = true
   }
   oss_addons = {
     enable_argocd = false # disable default argocd application set, we enable enable_aws_argocd_ingress above
@@ -99,7 +99,7 @@ locals {
     #enable_vpa                                   = true
     #enable_foo                                   = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set
   }
-  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })
+  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })
 
   addons_metadata = merge(
     module.eks_blueprints_addons.gitops_metadata,
diff --git a/argocd/iac/terraform/examples/eks/ingress-alb/variables.tf b/argocd/iac/terraform/examples/eks/ingress-alb/variables.tf
@@ -1,3 +1,7 @@
+variable "domain_name" {
+  description = "Route 53 domain name"
+  type = string
+}
 variable "gitops_addons_org" {
   description = "Git repository org/user contains for addons"
   default     = "https://github.com/gitops-bridge-dev"
diff --git a/argocd/iac/terraform/examples/eks/multi-cluster/distributed/main.tf b/argocd/iac/terraform/examples/eks/multi-cluster/distributed/main.tf
@@ -88,7 +88,7 @@ locals {
     #enable_vpa                                   = true
     #enable_foo                                   = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set
   }
-  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })
+  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })
 
   addons_metadata = merge(
     module.eks_blueprints_addons.gitops_metadata,
diff --git a/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/hub/main.tf b/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/hub/main.tf
@@ -90,7 +90,7 @@ locals {
     #enable_vpa                                   = true
     #enable_foo                                   = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set
   }
-  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })
+  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })
 
   addons_metadata = merge(
     module.eks_blueprints_addons.gitops_metadata,
diff --git a/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/spokes/main.tf b/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/spokes/main.tf
@@ -133,7 +133,7 @@ locals {
     #enable_vpa                                   = true
     #enable_foo                                   = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set
   }
-  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })
+  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })
 
   addons_metadata = merge(
     module.eks_blueprints_addons.gitops_metadata,
diff --git a/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/hub/main.tf b/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/hub/main.tf
@@ -90,7 +90,7 @@ locals {
     #enable_vpa                                   = true
     #enable_foo                                   = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set
   }
-  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })
+  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })
 
   addons_metadata = merge(
     module.eks_blueprints_addons.gitops_metadata,
diff --git a/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/spokes/main.tf b/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/spokes/main.tf
@@ -108,7 +108,7 @@ locals {
     #enable_vpa                                   = true
     #enable_foo                                   = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set
   }
-  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })
+  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })
 
   addons_metadata = merge(
     module.eks_blueprints_addons.gitops_metadata,
diff --git a/argocd/iac/terraform/examples/eks/private-git/main.tf b/argocd/iac/terraform/examples/eks/private-git/main.tf
@@ -98,7 +98,7 @@ locals {
     #enable_vpa                                   = true
     #enable_foo                                   = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set
   }
-  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })
+  addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })
 
   addons_metadata = merge(
     module.eks_blueprints_addons.gitops_metadata,

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ locals {`
`90`	`90`	`#enable_vpa = true`
`91`	`91`	`#enable_foo = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set`
`92`	`92`	`}`
`93`		`- addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })`
	`93`	`+ addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })`
`94`	`94`
`95`	`95`	`addons_metadata = merge(`
`96`	`96`	`module.eks_blueprints_addons.gitops_metadata,`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ locals {`
`86`	`86`	`enable_vpa = true`
`87`	`87`	`enable_foo = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set`
`88`	`88`	`}`
`89`		`- addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })`
	`89`	`+ addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })`
`90`	`90`
`91`	`91`	`addons_metadata = merge(`
`92`	`92`	`module.eks_blueprints_addons.gitops_metadata,`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ locals {`
`93`	`93`	`#enable_vpa = true`
`94`	`94`	`#enable_foo = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set`
`95`	`95`	`}`
`96`		`- addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })`
	`96`	`+ addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })`
`97`	`97`
`98`	`98`	`addons_metadata = merge(`
`99`	`99`	`module.eks_blueprints_addons.gitops_metadata,`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ locals {`
`98`	`98`	`#enable_vpa = true`
`99`	`99`	`#enable_foo = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set`
`100`	`100`	`}`
`101`		`- addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })`
	`101`	`+ addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })`
`102`	`102`
`103`	`103`	`addons_metadata = merge(`
`104`	`104`	`module.eks_blueprints_addons.gitops_metadata,`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ locals {`
`87`	`87`	`#enable_vpa = true`
`88`	`88`	`#enable_foo = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set`
`89`	`89`	`}`
`90`		`- addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })`
	`90`	`+ addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })`
`91`	`91`
`92`	`92`	`addons_metadata = merge(`
`93`	`93`	`module.eks_blueprints_addons.gitops_metadata,`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ locals {`
`88`	`88`	`#enable_vpa = true`
`89`	`89`	`#enable_foo = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set`
`90`	`90`	`}`
`91`		`- addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })`
	`91`	`+ addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })`
`92`	`92`
`93`	`93`	`addons_metadata = merge(`
`94`	`94`	`module.eks_blueprints_addons.gitops_metadata,`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ locals {`
`133`	`133`	`#enable_vpa = true`
`134`	`134`	`#enable_foo = true # you can add any addon here, make sure to update the gitops repo with the corresponding application set`
`135`	`135`	`}`
`136`		`- addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version })`
	`136`	`+ addons = merge(local.aws_addons, local.oss_addons, { kubernetes_version = local.cluster_version }, { aws_cluster_name = module.eks.cluster_name })`
`137`	`137`
`138`	`138`	`addons_metadata = merge(`
`139`	`139`	`module.eks_blueprints_addons.gitops_metadata,`