From 1ff70c38b4ff0410b897a2b5bdd846a4f279d46f Mon Sep 17 00:00:00 2001 From: Carlos Santana Date: Mon, 4 Sep 2023 20:46:30 -0400 Subject: [PATCH] fix argocd application namespace Signed-off-by: Carlos Santana --- .../{ingress-alb => argocd-ingress}/README.md | 0 .../bootstrap/addons.yaml | 0 .../bootstrap/workloads.yaml | 0 .../destroy.sh | 0 .../{ingress-alb => argocd-ingress}/main.tf | 6 +++-- .../outputs.tf | 1 + .../variables.tf | 0 .../versions.tf | 0 .../hub-spoke-shared/hub/main.tf | 25 ++++++------------- .../eks/multi-cluster/hub-spoke/hub/main.tf | 24 ++++++------------ 10 files changed, 20 insertions(+), 36 deletions(-) rename argocd/iac/terraform/examples/eks/{ingress-alb => argocd-ingress}/README.md (100%) rename argocd/iac/terraform/examples/eks/{ingress-alb => argocd-ingress}/bootstrap/addons.yaml (100%) rename argocd/iac/terraform/examples/eks/{ingress-alb => argocd-ingress}/bootstrap/workloads.yaml (100%) rename argocd/iac/terraform/examples/eks/{ingress-alb => argocd-ingress}/destroy.sh (100%) rename argocd/iac/terraform/examples/eks/{ingress-alb => argocd-ingress}/main.tf (98%) rename argocd/iac/terraform/examples/eks/{ingress-alb => argocd-ingress}/outputs.tf (97%) rename argocd/iac/terraform/examples/eks/{ingress-alb => argocd-ingress}/variables.tf (100%) rename argocd/iac/terraform/examples/eks/{ingress-alb => argocd-ingress}/versions.tf (100%) diff --git a/argocd/iac/terraform/examples/eks/ingress-alb/README.md b/argocd/iac/terraform/examples/eks/argocd-ingress/README.md similarity index 100% rename from argocd/iac/terraform/examples/eks/ingress-alb/README.md rename to argocd/iac/terraform/examples/eks/argocd-ingress/README.md diff --git a/argocd/iac/terraform/examples/eks/ingress-alb/bootstrap/addons.yaml b/argocd/iac/terraform/examples/eks/argocd-ingress/bootstrap/addons.yaml similarity index 100% rename from argocd/iac/terraform/examples/eks/ingress-alb/bootstrap/addons.yaml rename to argocd/iac/terraform/examples/eks/argocd-ingress/bootstrap/addons.yaml diff --git a/argocd/iac/terraform/examples/eks/ingress-alb/bootstrap/workloads.yaml b/argocd/iac/terraform/examples/eks/argocd-ingress/bootstrap/workloads.yaml similarity index 100% rename from argocd/iac/terraform/examples/eks/ingress-alb/bootstrap/workloads.yaml rename to argocd/iac/terraform/examples/eks/argocd-ingress/bootstrap/workloads.yaml diff --git a/argocd/iac/terraform/examples/eks/ingress-alb/destroy.sh b/argocd/iac/terraform/examples/eks/argocd-ingress/destroy.sh similarity index 100% rename from argocd/iac/terraform/examples/eks/ingress-alb/destroy.sh rename to argocd/iac/terraform/examples/eks/argocd-ingress/destroy.sh diff --git a/argocd/iac/terraform/examples/eks/ingress-alb/main.tf b/argocd/iac/terraform/examples/eks/argocd-ingress/main.tf similarity index 98% rename from argocd/iac/terraform/examples/eks/ingress-alb/main.tf rename to argocd/iac/terraform/examples/eks/argocd-ingress/main.tf index 825fc75b..06d4633f 100644 --- a/argocd/iac/terraform/examples/eks/ingress-alb/main.tf +++ b/argocd/iac/terraform/examples/eks/argocd-ingress/main.tf @@ -80,10 +80,12 @@ 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 @@ -91,7 +93,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 diff --git a/argocd/iac/terraform/examples/eks/ingress-alb/outputs.tf b/argocd/iac/terraform/examples/eks/argocd-ingress/outputs.tf similarity index 97% rename from argocd/iac/terraform/examples/eks/ingress-alb/outputs.tf rename to argocd/iac/terraform/examples/eks/argocd-ingress/outputs.tf index b1fa7096..77b4f836 100644 --- a/argocd/iac/terraform/examples/eks/ingress-alb/outputs.tf +++ b/argocd/iac/terraform/examples/eks/argocd-ingress/outputs.tf @@ -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 } diff --git a/argocd/iac/terraform/examples/eks/ingress-alb/variables.tf b/argocd/iac/terraform/examples/eks/argocd-ingress/variables.tf similarity index 100% rename from argocd/iac/terraform/examples/eks/ingress-alb/variables.tf rename to argocd/iac/terraform/examples/eks/argocd-ingress/variables.tf diff --git a/argocd/iac/terraform/examples/eks/ingress-alb/versions.tf b/argocd/iac/terraform/examples/eks/argocd-ingress/versions.tf similarity index 100% rename from argocd/iac/terraform/examples/eks/ingress-alb/versions.tf rename to argocd/iac/terraform/examples/eks/argocd-ingress/versions.tf 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 index f3d671fc..fc5a4141 100644 --- 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 @@ -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-*" } } 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 index 9b438fe0..8715527b 100644 --- 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 @@ -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 ################################################################################