From 784664313f2987bba714bb9942c36361de79f089 Mon Sep 17 00:00:00 2001 From: joaogac Date: Wed, 22 Apr 2026 07:21:27 -0300 Subject: [PATCH] adding spoke cluster Signed-off-by: joaogac --- .gitignore | 7 +++++++ .../default/addons/multi-acct/values.yaml | 2 +- .../tenants/tenant1/kro-clusters/values.yaml | 21 ++++++++++--------- scripts/create_ack_workload_roles.sh | 2 +- terraform/hub/terraform.tfvars | 4 ++-- 5 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c089201 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +# macOS +.DS_Store +.AppleDouble +.LSOverride +._* +.Spotlight-V100 +.Trashes diff --git a/addons/tenants/tenant1/default/addons/multi-acct/values.yaml b/addons/tenants/tenant1/default/addons/multi-acct/values.yaml index af4a115..a78e0f1 100644 --- a/addons/tenants/tenant1/default/addons/multi-acct/values.yaml +++ b/addons/tenants/tenant1/default/addons/multi-acct/values.yaml @@ -1,2 +1,2 @@ clusters: - workload-cluster1: "012345678910" # AWS account for workload cluster 1 + workload-cluster1: "577638363061" # AWS account for workload cluster 1 diff --git a/fleet/kro-values/tenants/tenant1/kro-clusters/values.yaml b/fleet/kro-values/tenants/tenant1/kro-clusters/values.yaml index ac79a6b..a92613c 100644 --- a/fleet/kro-values/tenants/tenant1/kro-clusters/values.yaml +++ b/fleet/kro-values/tenants/tenant1/kro-clusters/values.yaml @@ -1,14 +1,15 @@ clusters: - # workload-cluster1: - # managementAccountId: "XXXXXX" - # accountId: "XXXXXX" - # tenant: "tenant1" - # k8sVersion: "1.34" - # vpc: - # create: true - # gitops: - # addonsRepoUrl: "https://github.com/XXXXXX/eks-cluster-mgmt" - # fleetRepoUrl: "https://github.com/XXXXXX/eks-cluster-mgmt" + workload-cluster1: + managementAccountId: "267414915391" # hub account + accountId: "577638363061" # spoke account + tenant: "tenant1" + k8sVersion: "1.34" + workloads: "true" + vpc: + create: true + gitops: + addonsRepoUrl: "https://gi-8d30f0386d234e1a96d90d6234794869.ecs.us-east-1.on.aws/gitadmin/gitops-ack-kro-argocd" + fleetRepoUrl: "https://gi-8d30f0386d234e1a96d90d6234794869.ecs.us-east-1.on.aws/gitadmin/gitops-ack-kro-argocd" # workload-cluster2: # managementAccountId: "XXXXXX" diff --git a/scripts/create_ack_workload_roles.sh b/scripts/create_ack_workload_roles.sh index 1f83467..5578939 100755 --- a/scripts/create_ack_workload_roles.sh +++ b/scripts/create_ack_workload_roles.sh @@ -20,7 +20,7 @@ create_ack_workload_roles() { { "Effect": "Allow", "Principal": { - "AWS": "arn:aws:iam::${MGMT_ACCOUNT_ID}:role/${CLUSTER_NAME}-ack-controller" + "AWS": "arn:aws:iam::267414915391:role/eksctl-gitops-hub-cluster-capability-role-7H3-Role1-d4xdaCSdiaj8" }, "Action": [ "sts:AssumeRole", diff --git a/terraform/hub/terraform.tfvars b/terraform/hub/terraform.tfvars index ff40a07..55cea0d 100644 --- a/terraform/hub/terraform.tfvars +++ b/terraform/hub/terraform.tfvars @@ -3,7 +3,7 @@ kubernetes_version = "1.34" cluster_name = "hub-cluster" tenant = "tenant1" -git_org_name = "XXXXXXXX" # update this if you want to customize the gitops configurations +git_org_name = "gitadmin" # update this if you want to customize the gitops configurations gitops_addons_repo_name = "eks-cluster-mgmt" gitops_addons_repo_base_path = "addons/" @@ -16,4 +16,4 @@ gitops_fleet_repo_path = "bootstrap" gitops_fleet_repo_revision = "main" # AWS Accounts used for demo purposes (cluster1 cluster2) -account_ids = "012345678910 123456789101" # update this with your spoke aws accounts ids +account_ids = "577638363061" # update this with your spoke aws accounts ids