Fixing Cycle error (#59)

markoskandylis · web-flow · commit e2b4968adebd · 2024-04-12T10:23:40.000-04:00
* Creating control plane available addons repo

* Fixed the signature error

Signed-off-by: markos kandylis &lt;markos_kandylis@hotmail.com&gt;

* Fixig cycle error between role and eks cluster

Signed-off-by: markos kandylis &lt;markos_kandylis@hotmail.com&gt;

* Signed-off-by: markos kandylis &lt;markos_kandylis@hotmail.com&gt;

Made changes to hub-spoke for the cycle bug

---------

Signed-off-by: markos kandylis &lt;markos_kandylis@hotmail.com&gt;
diff --git a/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/spokes/main.tf b/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/spokes/main.tf
@@ -249,14 +249,12 @@ data "aws_iam_policy_document" "assume_role_policy" {
   }
 }
 resource "aws_iam_role" "spoke" {
-  name               = "${module.eks.cluster_name}-argocd-spoke"
+  name               = "${local.name}-argocd-spoke"
   assume_role_policy = data.aws_iam_policy_document.assume_role_policy.json
 }
 
 
 
-
-
 ################################################################################
 # EKS Blueprints Addons
 ################################################################################
diff --git a/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/spokes/main.tf b/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/spokes/main.tf
@@ -194,7 +194,7 @@ data "aws_iam_policy_document" "assume_role_policy" {
   }
 }
 resource "aws_iam_role" "spoke" {
-  name               = "${module.eks.cluster_name}-argocd-spoke"
+  name               = "${local.name}-argocd-spoke"
   assume_role_policy = data.aws_iam_policy_document.assume_role_policy.json
 }
 

Original file line number	Diff line number	Diff line change
`@@ -249,14 +249,12 @@ data "aws_iam_policy_document" "assume_role_policy" {`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`	`resource "aws_iam_role" "spoke" {`
`252`		`- name = "${module.eks.cluster_name}-argocd-spoke"`
	`252`	`+ name = "${local.name}-argocd-spoke"`
`253`	`253`	`assume_role_policy = data.aws_iam_policy_document.assume_role_policy.json`
`254`	`254`	`}`
`255`	`255`
`256`	`256`
`257`	`257`
`258`		`-`
`259`		`-`
`260`	`258`	`################################################################################`
`261`	`259`	`# EKS Blueprints Addons`
`262`	`260`	`################################################################################`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ data "aws_iam_policy_document" "assume_role_policy" {`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`	`resource "aws_iam_role" "spoke" {`
`197`		`- name = "${module.eks.cluster_name}-argocd-spoke"`
	`197`	`+ name = "${local.name}-argocd-spoke"`
`198`	`198`	`assume_role_policy = data.aws_iam_policy_document.assume_role_policy.json`
`199`	`199`	`}`
`200`	`200`