Skip to content

fix argocd application namespace #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 5, 2023
Merged

fix argocd application namespace #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...raform/examples/eks/ingress-alb/README.md → ...orm/examples/eks/argocd-ingress/README.md
View file
Open in desktop
File renamed without changes.
0 ...les/eks/ingress-alb/bootstrap/addons.yaml → .../eks/argocd-ingress/bootstrap/addons.yaml
View file
Open in desktop
File renamed without changes.
0 .../eks/ingress-alb/bootstrap/workloads.yaml → ...s/argocd-ingress/bootstrap/workloads.yaml
View file
Open in desktop
File renamed without changes.
0 ...aform/examples/eks/ingress-alb/destroy.sh → ...rm/examples/eks/argocd-ingress/destroy.sh
View file
Open in desktop
File renamed without changes.
6 changes: 4 additions & 2 deletions ...erraform/examples/eks/ingress-alb/main.tf → ...aform/examples/eks/argocd-ingress/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions ...aform/examples/eks/ingress-alb/outputs.tf → ...rm/examples/eks/argocd-ingress/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
0 ...orm/examples/eks/ingress-alb/variables.tf → .../examples/eks/argocd-ingress/variables.tf
View file
Open in desktop
File renamed without changes.
0 ...form/examples/eks/ingress-alb/versions.tf → ...m/examples/eks/argocd-ingress/versions.tf
View file
Open in desktop
File renamed without changes.
25 changes: 8 additions & 17 deletions argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/hub/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
}
}

Expand All @@ -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-*"
}
}
Expand Down
24 changes: 7 additions & 17 deletions argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/hub/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
}
}

Expand All @@ -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-*"
}
}
Expand All @@ -201,7 +192,6 @@ data "aws_iam_policy_document" "irsa_policy" {
}
}


################################################################################
# EKS Blueprints Addons
################################################################################
Expand Down