Skip to content

Commit f40b024

Browse files
diegoitaliaitdiegoitaliait
committed
better argocd projects names
1 parent 34f9de8 commit f40b024

File tree

2 files changed

+39
-39
lines changed

2 files changed

+39
-39
lines changed

‎src/domains/diego-app/10_argocd.tf‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
locals {
2-
project_name = "${var.domain}-project"
2+
project_blue_name = "blue-${var.domain}-project"
33
}
44

55
#
66
# Terraform argocd project
77
#
8-
resource "argocd_project" "argocd_project_diego" {
8+
resource "argocd_project" "argocd_project_diego_blue" {
99
metadata {
10-
name = local.project_name # e.g. "diego-project"
10+
name = local.project_blue_name # e.g. "diego-project"
1111
namespace = "argocd"
1212

1313
labels = {
@@ -16,7 +16,7 @@ resource "argocd_project" "argocd_project_diego" {
1616
}
1717

1818
spec {
19-
description = local.project_name
19+
description = local.project_blue_name
2020

2121
# Restrict manifest sources to this domain's repos
2222
source_namespaces = [var.domain]
@@ -52,10 +52,10 @@ resource "argocd_project" "argocd_project_diego" {
5252
name = "admin"
5353
groups = []
5454
policies = [
55-
"p, proj:${local.project_name}:admin, applications, *, ${local.project_name}/*, allow",
56-
"p, proj:${local.project_name}:admin, applicationsets, *, ${local.project_name}/*, allow",
57-
"p, proj:${local.project_name}:admin, logs, get, ${local.project_name}/*, allow",
58-
"p, proj:${local.project_name}:admin, exec, create, ${local.project_name}/*, allow",
55+
"p, proj:${local.project_blue_name}:admin, applications, *, ${local.project_blue_name}/*, allow",
56+
"p, proj:${local.project_blue_name}:admin, applicationsets, *, ${local.project_blue_name}/*, allow",
57+
"p, proj:${local.project_blue_name}:admin, logs, get, ${local.project_blue_name}/*, allow",
58+
"p, proj:${local.project_blue_name}:admin, exec, create, ${local.project_blue_name}/*, allow",
5959
]
6060
}
6161

@@ -64,13 +64,13 @@ resource "argocd_project" "argocd_project_diego" {
6464
name = "developer"
6565
groups = []
6666
policies = [
67-
"p, proj:${local.project_name}:developer, applications, get, ${local.project_name}/*, allow",
68-
"p, proj:${local.project_name}:developer, applications, create, ${local.project_name}/*, allow",
69-
"p, proj:${local.project_name}:developer, applications, update, ${local.project_name}/*, allow",
70-
"p, proj:${local.project_name}:developer, applications, delete, ${local.project_name}/*, allow",
71-
"p, proj:${local.project_name}:developer, applications, sync, ${local.project_name}/*, allow",
72-
"p, proj:${local.project_name}:developer, applicationsets, *, ${local.project_name}/*, allow",
73-
"p, proj:${local.project_name}:developer, logs, get, ${local.project_name}/*, allow",
67+
"p, proj:${local.project_blue_name}:developer, applications, get, ${local.project_blue_name}/*, allow",
68+
"p, proj:${local.project_blue_name}:developer, applications, create, ${local.project_blue_name}/*, allow",
69+
"p, proj:${local.project_blue_name}:developer, applications, update, ${local.project_blue_name}/*, allow",
70+
"p, proj:${local.project_blue_name}:developer, applications, delete, ${local.project_blue_name}/*, allow",
71+
"p, proj:${local.project_blue_name}:developer, applications, sync, ${local.project_blue_name}/*, allow",
72+
"p, proj:${local.project_blue_name}:developer, applicationsets, *, ${local.project_blue_name}/*, allow",
73+
"p, proj:${local.project_blue_name}:developer, logs, get, ${local.project_blue_name}/*, allow",
7474
]
7575
}
7676

@@ -79,8 +79,8 @@ resource "argocd_project" "argocd_project_diego" {
7979
name = "reader"
8080
groups = [data.azuread_group.adgroup_admin.object_id]
8181
policies = [
82-
"p, proj:${local.project_name}:reader, applications, get, ${local.project_name}/*, allow",
83-
"p, proj:${local.project_name}:reader, logs, get, ${local.project_name}/*, allow",
82+
"p, proj:${local.project_blue_name}:reader, applications, get, ${local.project_blue_name}/*, allow",
83+
"p, proj:${local.project_blue_name}:reader, logs, get, ${local.project_blue_name}/*, allow",
8484
]
8585
}
8686
}
@@ -120,7 +120,7 @@ locals {
120120
]...)
121121
}
122122

123-
resource "argocd_application" "diego_applications" {
123+
resource "argocd_application" "diego_applications_blue" {
124124
for_each = local.flattened_applications
125125

126126
metadata {
@@ -135,7 +135,7 @@ resource "argocd_application" "diego_applications" {
135135
}
136136

137137
spec {
138-
project = argocd_project.argocd_project_diego.metadata[0].name
138+
project = argocd_project.argocd_project_diego_blue.metadata[0].name
139139

140140
destination {
141141
server = "https://kubernetes.default.svc"

‎src/domains/diego-app/20_argocd_fake_project.tf‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
locals {
2-
project_name2 = "${var.domain}-project-2"
2+
project_diego_green = "green-${var.domain}-project"
33
}
44

55
#
66
# Terraform argocd project
77
#
8-
resource "argocd_project" "argocd_project_diego2" {
8+
resource "argocd_project" "argocd_project_green" {
99
metadata {
10-
name = local.project_name2 # e.g. "diego-project"
10+
name = local.project_diego_green # e.g. "diego-project"
1111
namespace = "argocd"
1212

1313
labels = {
@@ -16,7 +16,7 @@ resource "argocd_project" "argocd_project_diego2" {
1616
}
1717

1818
spec {
19-
description = local.project_name2
19+
description = local.project_diego_green
2020

2121
# solo manifest provenienti dal repo naming-convention del dominio
2222
source_namespaces = [var.domain]
@@ -55,44 +55,44 @@ resource "argocd_project" "argocd_project_diego2" {
5555
name = "admin"
5656
groups = []
5757
policies = [
58-
"p, proj:${local.project_name2}:admin, applications, *, ${local.project_name2}/*, allow",
59-
"p, proj:${local.project_name2}:admin, applicationsets, *, ${local.project_name2}/*, allow",
60-
"p, proj:${local.project_name2}:admin, logs, get, ${local.project_name2}/*, allow",
61-
"p, proj:${local.project_name2}:admin, exec, create, ${local.project_name2}/*, allow",
58+
"p, proj:${local.project_diego_green}:admin, applications, *, ${local.project_diego_green}/*, allow",
59+
"p, proj:${local.project_diego_green}:admin, applicationsets, *, ${local.project_diego_green}/*, allow",
60+
"p, proj:${local.project_diego_green}:admin, logs, get, ${local.project_diego_green}/*, allow",
61+
"p, proj:${local.project_diego_green}:admin, exec, create, ${local.project_diego_green}/*, allow",
6262
]
6363
}
6464

6565
role {
6666
name = "developer"
6767
groups = [] # popola con i group objectId Entra ID
6868
policies = [
69-
"p, proj:${local.project_name2}:developer, applications, get, ${local.project_name2}/*, allow",
70-
"p, proj:${local.project_name2}:developer, applications, create, ${local.project_name2}/*, allow",
71-
"p, proj:${local.project_name2}:developer, applications, update, ${local.project_name2}/*, allow",
72-
"p, proj:${local.project_name2}:developer, applications, delete, ${local.project_name2}/*, allow",
73-
"p, proj:${local.project_name2}:developer, applications, sync, ${local.project_name2}/*, allow",
74-
"p, proj:${local.project_name2}:developer, applicationsets, *, ${local.project_name2}/*, allow",
75-
"p, proj:${local.project_name2}:developer, logs, get, ${local.project_name2}/*, allow",
69+
"p, proj:${local.project_diego_green}:developer, applications, get, ${local.project_diego_green}/*, allow",
70+
"p, proj:${local.project_diego_green}:developer, applications, create, ${local.project_diego_green}/*, allow",
71+
"p, proj:${local.project_diego_green}:developer, applications, update, ${local.project_diego_green}/*, allow",
72+
"p, proj:${local.project_diego_green}:developer, applications, delete, ${local.project_diego_green}/*, allow",
73+
"p, proj:${local.project_diego_green}:developer, applications, sync, ${local.project_diego_green}/*, allow",
74+
"p, proj:${local.project_diego_green}:developer, applicationsets, *, ${local.project_diego_green}/*, allow",
75+
"p, proj:${local.project_diego_green}:developer, logs, get, ${local.project_diego_green}/*, allow",
7676
]
7777
}
7878

7979
role {
8080
name = "reader"
8181
groups = [] # popola con i group objectId Entra ID
8282
policies = [
83-
"p, proj:${local.project_name2}:reader, applications, get, ${local.project_name2}/*, allow",
84-
"p, proj:${local.project_name2}:reader, logs, get, ${local.project_name2}/*, allow",
83+
"p, proj:${local.project_diego_green}:reader, applications, get, ${local.project_diego_green}/*, allow",
84+
"p, proj:${local.project_diego_green}:reader, logs, get, ${local.project_diego_green}/*, allow",
8585
]
8686
}
8787
}
8888
}
8989

9090

91-
resource "argocd_application" "diego_applications2" {
91+
resource "argocd_application" "diego_applications_green" {
9292
for_each = local.flattened_applications
9393

9494
metadata {
95-
name = "${each.value.name}-2"
95+
name = "${each.value.name}-green"
9696
namespace = var.domain
9797
labels = {
9898
name = each.value.name
@@ -103,7 +103,7 @@ resource "argocd_application" "diego_applications2" {
103103
}
104104

105105
spec {
106-
project = argocd_project.argocd_project_diego2.metadata[0].name
106+
project = argocd_project.argocd_project_green.metadata[0].name
107107

108108
destination {
109109
server = "https://kubernetes.default.svc"

0 commit comments

Comments
 (0)