simpler to setup argocd with aws alb (#18)

csantanapr · web-flow · commit bfa42333e5a6 · 2023-09-03T23:15:35.000-04:00
Signed-off-by: Carlos Santana &lt;csantana23@gmail.com&gt;
diff --git a/argocd/iac/terraform/examples/eks/ingress-alb/main.tf b/argocd/iac/terraform/examples/eks/ingress-alb/main.tf
@@ -80,10 +80,8 @@ 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 = true
   }
   oss_addons = {
-    enable_argocd = false # disable default argocd application set, we enable enable_aws_argocd_ingress above
     #enable_argo_rollouts                         = true
     #enable_argo_events                          = true
     #enable_argo_workflows                        = true
@@ -112,8 +110,6 @@ locals {
     {
       argocd_hosts                = "[${local.argocd_host}]"
       external_dns_domain_filters = "[${local.domain_name}]"
-      argocd_iam_role_arn         = ""
-      argocd_namespace            = "argocd"
     },
     {
       addons_repo_url      = local.gitops_addons_url

Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,8 @@ locals {`
`80`	`80`	`#enable_aws_gateway_api_controller = true`
`81`	`81`	`#enable_aws_ebs_csi_resources = true # generate gp2 and gp3 storage classes for ebs-csi`
`82`	`82`	`#enable_aws_secrets_store_csi_driver_provider = true`
`83`		`- enable_aws_argocd = true`
`84`	`83`	`}`
`85`	`84`	`oss_addons = {`
`86`		`- enable_argocd = false # disable default argocd application set, we enable enable_aws_argocd_ingress above`
`87`	`85`	`#enable_argo_rollouts = true`
`88`	`86`	`#enable_argo_events = true`
`89`	`87`	`#enable_argo_workflows = true`
`@@ -112,8 +110,6 @@ locals {`
`112`	`110`	`{`
`113`	`111`	`argocd_hosts = "[${local.argocd_host}]"`
`114`	`112`	`external_dns_domain_filters = "[${local.domain_name}]"`
`115`		`- argocd_iam_role_arn = ""`
`116`		`- argocd_namespace = "argocd"`
`117`	`113`	`},`
`118`	`114`	`{`
`119`	`115`	`addons_repo_url = local.gitops_addons_url`