fix argocd application namespace (#23)

Signed-off-by: Carlos Santana <csantana23@gmail.com>

Author: csantanapr

argocd/iac/terraform/examples/eks/ingress-alb/README.md renamed to argocd/iac/terraform/examples/eks/argocd-ingress/README.md

@@ -80,18 +80,20 @@ 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
   }
   oss_addons = {
+    enable_argocd                                 = false
     #enable_argo_rollouts                         = true
-    #enable_argo_events                          = true
+    #enable_argo_events                           = true
     #enable_argo_workflows                        = true
     #enable_cluster_proportional_autoscaler       = true
     #enable_gatekeeper                            = true
     #enable_gpu_operator                          = true
     #enable_ingress_nginx                         = true
     #enable_kyverno                               = true
     #enable_kube_prometheus_stack                 = true
-    enable_metrics_server = true
+    #enable_metrics_server = true
     #enable_prometheus_adapter                    = true
     #enable_secrets_store_csi_driver              = true
     #enable_vpa                                   = true

argocd/iac/terraform/examples/eks/ingress-alb/bootstrap/addons.yaml renamed to argocd/iac/terraform/examples/eks/argocd-ingress/bootstrap/addons.yaml

@@ -16,6 +16,7 @@ output "configure_argocd" {
     argocd login --port-forward --username admin --password $(argocd admin initial-password | head -1)
     echo "ArgoCD Username: admin"
     echo "ArgoCD Password: $(kubectl get secrets argocd-initial-admin-secret -n argocd --template="{{index .data.password | base64decode}}")"
+    echo Port Forward: http://localhost:8080
     kubectl port-forward -n argocd svc/argo-cd-argocd-server 8080:80
     EOT
 }

argocd/iac/terraform/examples/eks/ingress-alb/bootstrap/workloads.yaml renamed to argocd/iac/terraform/examples/eks/argocd-ingress/bootstrap/workloads.yaml

@@ -53,6 +53,8 @@ locals {
   gitops_addons_path     = var.gitops_addons_path
   gitops_addons_revision = var.gitops_addons_revision
 
+  argocd_namespace = "argocd"
+
   aws_addons = {
     enable_cert_manager = true
     #enable_aws_efs_csi_driver                    = true
@@ -62,7 +64,7 @@ locals {
     #enable_cluster_autoscaler                    = true
     #enable_external_dns                          = true
     #enable_external_secrets                      = true
-    enable_aws_load_balancer_controller = true
+    #enable_aws_load_balancer_controller          = true
     #enable_fargate_fluentbit                     = true
     #enable_aws_for_fluentbit                     = true
     #enable_aws_node_termination_handler          = true
@@ -84,7 +86,7 @@ locals {
     #enable_ingress_nginx                         = true
     #enable_kyverno                               = true
     #enable_kube_prometheus_stack                 = true
-    enable_metrics_server = true
+    #enable_metrics_server = true
     #enable_prometheus_adapter                    = true
     #enable_secrets_store_csi_driver              = true
     #enable_vpa                                   = true
@@ -101,8 +103,8 @@ locals {
       aws_vpc_id       = module.vpc.vpc_id
     },
     {
-      argocd_iam_role_arn = module.argocd_irsa.iam_role_arn,
-      argocd_namespace    = "argocd"
+      argocd_iam_role_arn = module.argocd_irsa.iam_role_arn
+      argocd_namespace    = local.argocd_namespace
     },
     {
       addons_repo_url      = local.gitops_addons_url
@@ -145,18 +147,7 @@ module "gitops_bridge_bootstrap" {
   argocd_cluster               = module.gitops_bridge_metadata.argocd
   argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
   argocd = {
-    values = [
-      <<-EOT
-      controller:
-        serviceAccount:
-          annotations:
-            eks.amazonaws.com/role-arn: ${module.argocd_irsa.iam_role_arn}
-      server:
-        serviceAccount:
-          annotations:
-            eks.amazonaws.com/role-arn: ${module.argocd_irsa.iam_role_arn}
-      EOT
-    ]
+    namespace = local.argocd_namespace
   }
 }
 
@@ -178,7 +169,7 @@ module "argocd_irsa" {
   oidc_providers = {
     this = {
       provider_arn    = module.eks.oidc_provider_arn
-      namespace       = "argocd"
+      namespace       = local.argocd_namespace
       service_account = "argocd-*"
     }
   }

argocd/iac/terraform/examples/eks/ingress-alb/destroy.sh renamed to argocd/iac/terraform/examples/eks/argocd-ingress/destroy.sh

@@ -53,6 +53,8 @@ locals {
   gitops_addons_path     = var.gitops_addons_path
   gitops_addons_revision = var.gitops_addons_revision
 
+  argocd_namespace = "argocd"
+
   aws_addons = {
     enable_cert_manager = true
     #enable_aws_efs_csi_driver                    = true
@@ -84,7 +86,7 @@ locals {
     #enable_ingress_nginx                         = true
     #enable_kyverno                               = true
     #enable_kube_prometheus_stack                 = true
-    enable_metrics_server = true
+    #enable_metrics_server = true
     #enable_prometheus_adapter                    = true
     #enable_secrets_store_csi_driver              = true
     #enable_vpa                                   = true
@@ -101,8 +103,8 @@ locals {
       aws_vpc_id       = module.vpc.vpc_id
     },
     {
-      argocd_iam_role_arn = module.argocd_irsa.iam_role_arn,
-      argocd_namespace    = "argocd"
+      argocd_iam_role_arn = module.argocd_irsa.iam_role_arn
+      argocd_namespace    = local.argocd_namespace
     },
     {
       addons_repo_url      = local.gitops_addons_url
@@ -145,18 +147,7 @@ module "gitops_bridge_bootstrap" {
   argocd_cluster               = module.gitops_bridge_metadata.argocd
   argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
   argocd = {
-    values = [
-      <<-EOT
-      controller:
-        serviceAccount:
-          annotations:
-            eks.amazonaws.com/role-arn: ${module.argocd_irsa.iam_role_arn}
-      server:
-        serviceAccount:
-          annotations:
-            eks.amazonaws.com/role-arn: ${module.argocd_irsa.iam_role_arn}
-      EOT
-    ]
+    namespace = local.argocd_namespace
   }
 }
 
@@ -178,7 +169,7 @@ module "argocd_irsa" {
   oidc_providers = {
     this = {
       provider_arn    = module.eks.oidc_provider_arn
-      namespace       = "argocd"
+      namespace       = local.argocd_namespace
       service_account = "argocd-*"
     }
   }
@@ -201,7 +192,6 @@ data "aws_iam_policy_document" "irsa_policy" {
   }
 }
 
-
 ################################################################################
 # EKS Blueprints Addons
 ################################################################################