Skip to content

Commit ba02223

Browse files
committed
cleanup kargo projects
1 parent 708dd16 commit ba02223

File tree

2 files changed

+27
-23
lines changed

2 files changed

+27
-23
lines changed

argocd-bootstrap/main.tf

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,16 @@ resource "argocd_project" "projects" {
88
spec {
99
description = each.value.description
1010

11-
source_repos = ["*"]
11+
source_repos = ["*"]
12+
1213

13-
1414
dynamic "destination" {
1515
for_each = each.value.destinations
1616
iterator = DESTINATION
1717
content {
1818
name = DESTINATION.value.name
1919
namespace = DESTINATION.value.namespace
20+
server = "*"
2021
}
2122
}
2223

@@ -66,6 +67,7 @@ resource "argocd_application" "app-of-apps" {
6667
# }
6768
# }
6869
}
70+
depends_on = [argocd_project.projects]
6971

7072
}
7173

@@ -101,6 +103,7 @@ resource "argocd_application" "app-of-components" {
101103
# }
102104
# }
103105
}
106+
depends_on = [argocd_project.projects]
104107

105108
}
106109

@@ -137,4 +140,5 @@ resource "argocd_application" "app-of-kargo" {
137140
# }
138141
}
139142

143+
depends_on = [argocd_project.projects]
140144
}

argocd-bootstrap/variables.tf

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,69 +29,69 @@ variable "source_directory_path" {
2929

3030
variable "project_spaces" {
3131
description = "Project spaces allow apps to be logically grouped."
32-
type = map(object(
32+
type = map(object(
3333
{
34-
name = string
34+
name = string
3535
description = string
3636
destinations = list(object({
37-
name = string
37+
name = string
3838
namespace = string
3939
}))
4040
cluster-allows = list(object({
4141
group = string
42-
kind = string
42+
kind = string
4343
}))
4444
}
45-
))
45+
))
4646
default = {
4747
"components" = {
48-
"name" = "components"
48+
"name" = "components"
4949
"description" = "Cluster addons, components"
5050
"destinations" = [{
51-
name = "*"
52-
namespace ="*"
51+
name = "*"
52+
namespace = "*"
5353
}]
5454
"cluster-allows" = [{
5555
group = "*"
56-
kind = "*"
56+
kind = "*"
5757
}]
5858
}
5959

6060
"pattern-apps" = {
61-
"name" = "pattern-apps"
61+
"name" = "pattern-apps"
6262
"description" = "For apps using org-wide standard ABC"
6363
"destinations" = [{
64-
name = "*"
65-
namespace ="*"
64+
name = "*"
65+
namespace = "*"
6666
}]
6767
"cluster-allows" = [{
6868
group = "*"
69-
kind = "Namespace"
69+
kind = "Namespace"
7070
}]
7171
}
7272

7373
"kargo" = {
74-
"name" = "kargo"
74+
"name" = "kargo"
7575
"description" = "Kargo definitions only"
7676
"destinations" = [{
77-
name = "kargo"
78-
namespace ="*"
77+
name = "*"
78+
namespace = "*"
7979
}]
8080
"cluster-allows" = [{
8181
group = "*"
82-
kind = "*"
82+
kind = "*"
8383
}]
8484
}
8585
"rollouts" = {
86-
"name" = "rollouts"
86+
"name" = "rollouts"
8787
"description" = "Various progressive release demos"
8888
"destinations" = [{
89-
name = "*"
90-
namespace ="*"
89+
name = "*"
90+
namespace = "*"
9191
}]
9292
"cluster-allows" = [{
9393
group = "*"
94-
kind = "*"
94+
kind = "*"
9595
}]
9696
}
9797
}

0 commit comments

Comments
 (0)