Skip to content

Commit 93eb984

Browse files
csantanaprcsantanapr
authored
feat: Remove modules and use external github modules for metadata and bootstrap (#17)
* remove modules and use external github modules Signed-off-by: Carlos Santana <csantana23@gmail.com> * add argo events placeholder Signed-off-by: Carlos Santana <csantana23@gmail.com> --------- Signed-off-by: Carlos Santana <csantana23@gmail.com>
1 parent 6350d9c commit 93eb984

File tree

20 files changed

+41
-274
lines changed

20 files changed

+41
-274
lines changed

‎argocd/iac/terraform/examples/eks/aws-secrets-manager/main.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ locals {
7676
}
7777
oss_addons = {
7878
#enable_argo_rollouts = true
79+
#enable_argo_events = true
7980
#enable_argo_workflows = true
8081
#enable_cluster_proportional_autoscaler = true
8182
#enable_gatekeeper = true
@@ -125,7 +126,7 @@ locals {
125126
# GitOps Bridge: Metadata
126127
################################################################################
127128
module "gitops_bridge_metadata" {
128-
source = "../../../modules/gitops-bridge-metadata"
129+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"
129130

130131
cluster_name = module.eks.cluster_name
131132
environment = local.environment
@@ -137,7 +138,7 @@ module "gitops_bridge_metadata" {
137138
# GitOps Bridge: Bootstrap
138139
################################################################################
139140
module "gitops_bridge_bootstrap" {
140-
source = "../../../modules/gitops-bridge-bootstrap"
141+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"
141142

142143
argocd_cluster = module.gitops_bridge_metadata.argocd
143144
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps

‎argocd/iac/terraform/examples/eks/complete/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ locals {
133133
# GitOps Bridge: Metadata
134134
################################################################################
135135
module "gitops_bridge_metadata" {
136-
source = "../../../modules/gitops-bridge-metadata"
136+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"
137137

138138
cluster_name = module.eks.cluster_name
139139
environment = local.environment
@@ -145,7 +145,7 @@ module "gitops_bridge_metadata" {
145145
# GitOps Bridge: Bootstrap
146146
################################################################################
147147
module "gitops_bridge_bootstrap" {
148-
source = "../../../modules/gitops-bridge-bootstrap"
148+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"
149149

150150
argocd_cluster = module.gitops_bridge_metadata.argocd
151151
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps

‎argocd/iac/terraform/examples/eks/crossplane/main.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ locals {
8080
enable_crossplane = true # installs crossplane core
8181
enable_metrics_server = true
8282
#enable_argo_rollouts = true
83+
#enable_argo_events = true
8384
#enable_argo_workflows = true
8485
#enable_cluster_proportional_autoscaler = true
8586
#enable_gatekeeper = true
@@ -132,7 +133,7 @@ locals {
132133
# GitOps Bridge: Metadata
133134
################################################################################
134135
module "gitops_bridge_metadata" {
135-
source = "../../../modules/gitops-bridge-metadata"
136+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"
136137

137138
cluster_name = module.eks.cluster_name
138139
environment = local.environment
@@ -144,7 +145,7 @@ module "gitops_bridge_metadata" {
144145
# GitOps Bridge: Bootstrap
145146
################################################################################
146147
module "gitops_bridge_bootstrap" {
147-
source = "../../../modules/gitops-bridge-bootstrap"
148+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"
148149

149150
argocd_cluster = module.gitops_bridge_metadata.argocd
150151
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps

‎argocd/iac/terraform/examples/eks/external-secrets/main.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ locals {
8484
}
8585
oss_addons = {
8686
#enable_argo_rollouts = true
87+
#enable_argo_events = true
8788
#enable_argo_workflows = true
8889
#enable_cluster_proportional_autoscaler = true
8990
#enable_gatekeeper = true
@@ -171,7 +172,7 @@ resource "aws_ssm_parameter" "secret_parameter" {
171172
# GitOps Bridge: Metadata
172173
################################################################################
173174
module "gitops_bridge_metadata" {
174-
source = "../../../modules/gitops-bridge-metadata"
175+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"
175176

176177
cluster_name = module.eks.cluster_name
177178
environment = local.environment
@@ -183,7 +184,7 @@ module "gitops_bridge_metadata" {
183184
# GitOps Bridge: Bootstrap
184185
################################################################################
185186
module "gitops_bridge_bootstrap" {
186-
source = "../../../modules/gitops-bridge-bootstrap"
187+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"
187188

188189
argocd_cluster = module.gitops_bridge_metadata.argocd
189190
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps

‎argocd/iac/terraform/examples/eks/hello-world/main.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ locals {
7373
}
7474
oss_addons = {
7575
#enable_argo_rollouts = true
76+
#enable_argo_events = true
7677
#enable_argo_workflows = true
7778
#enable_cluster_proportional_autoscaler = true
7879
#enable_gatekeeper = true
@@ -122,7 +123,7 @@ locals {
122123
# GitOps Bridge: Metadata
123124
################################################################################
124125
module "gitops_bridge_metadata" {
125-
source = "../../../modules/gitops-bridge-metadata"
126+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"
126127

127128
cluster_name = module.eks.cluster_name
128129
environment = local.environment
@@ -134,7 +135,7 @@ module "gitops_bridge_metadata" {
134135
# GitOps Bridge: Bootstrap
135136
################################################################################
136137
module "gitops_bridge_bootstrap" {
137-
source = "../../../modules/gitops-bridge-bootstrap"
138+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"
138139

139140
argocd_cluster = module.gitops_bridge_metadata.argocd
140141
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps

‎argocd/iac/terraform/examples/eks/ingress-alb/main.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ locals {
8585
oss_addons = {
8686
enable_argocd = false # disable default argocd application set, we enable enable_aws_argocd_ingress above
8787
#enable_argo_rollouts = true
88+
#enable_argo_events = true
8889
#enable_argo_workflows = true
8990
#enable_cluster_proportional_autoscaler = true
9091
#enable_gatekeeper = true
@@ -140,7 +141,7 @@ locals {
140141
# GitOps Bridge: Metadata
141142
################################################################################
142143
module "gitops_bridge_metadata" {
143-
source = "../../../modules/gitops-bridge-metadata"
144+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"
144145

145146
cluster_name = module.eks.cluster_name
146147
environment = local.environment
@@ -152,7 +153,7 @@ module "gitops_bridge_metadata" {
152153
# GitOps Bridge: Bootstrap
153154
################################################################################
154155
module "gitops_bridge_bootstrap" {
155-
source = "../../../modules/gitops-bridge-bootstrap"
156+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"
156157

157158
argocd_cluster = module.gitops_bridge_metadata.argocd
158159
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps

‎argocd/iac/terraform/examples/eks/multi-cluster/distributed/main.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ locals {
7474
}
7575
oss_addons = {
7676
#enable_argo_rollouts = true
77+
#enable_argo_events = true
7778
#enable_argo_workflows = true
7879
#enable_cluster_proportional_autoscaler = true
7980
#enable_gatekeeper = true
@@ -126,7 +127,7 @@ locals {
126127
# GitOps Bridge: Metadata
127128
################################################################################
128129
module "gitops_bridge_metadata" {
129-
source = "../../../../modules/gitops-bridge-metadata"
130+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"
130131

131132
cluster_name = module.eks.cluster_name
132133
environment = local.environment
@@ -138,7 +139,7 @@ module "gitops_bridge_metadata" {
138139
# GitOps Bridge: Bootstrap
139140
################################################################################
140141
module "gitops_bridge_bootstrap" {
141-
source = "../../../../modules/gitops-bridge-bootstrap"
142+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"
142143

143144
argocd_cluster = module.gitops_bridge_metadata.argocd
144145
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps

‎argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/hub/main.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ locals {
7676
oss_addons = {
7777
enable_argocd = false # disable default argocd application set, we enable enable_aws_argocd above
7878
#enable_argo_rollouts = true
79+
#enable_argo_events = true
7980
#enable_argo_workflows = true
8081
#enable_cluster_proportional_autoscaler = true
8182
#enable_gatekeeper = true
@@ -127,7 +128,7 @@ locals {
127128
# GitOps Bridge: Metadata
128129
################################################################################
129130
module "gitops_bridge_metadata" {
130-
source = "../../../../../modules/gitops-bridge-metadata"
131+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"
131132

132133
cluster_name = module.eks.cluster_name
133134
environment = local.environment
@@ -139,7 +140,7 @@ module "gitops_bridge_metadata" {
139140
# GitOps Bridge: Bootstrap
140141
################################################################################
141142
module "gitops_bridge_bootstrap" {
142-
source = "../../../../../modules/gitops-bridge-bootstrap"
143+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"
143144

144145
argocd_cluster = module.gitops_bridge_metadata.argocd
145146
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps

‎argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/spokes/main.tf‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ locals {
119119
}
120120
oss_addons = {
121121
#enable_argo_rollouts = true
122+
#enable_argo_events = true
122123
#enable_argo_workflows = true
123124
#enable_cluster_proportional_autoscaler = true
124125
#enable_gatekeeper = true
@@ -170,7 +171,7 @@ locals {
170171
# GitOps Bridge: Metadata for Spoke Cluster
171172
################################################################################
172173
module "gitops_bridge_metadata_spoke" {
173-
source = "../../../../../modules/gitops-bridge-metadata"
174+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"
174175

175176
cluster_name = module.eks.cluster_name
176177
environment = local.environment
@@ -190,7 +191,7 @@ resource "time_sleep" "wait_for_argocd_namespace_and_crds" {
190191
depends_on = [module.gitops_bridge_bootstrap_hub]
191192
}
192193
module "gitops_bridge_bootstrap_spoke" {
193-
source = "../../../../../modules/gitops-bridge-bootstrap"
194+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"
194195

195196
argocd_cluster = module.gitops_bridge_metadata_spoke.argocd
196197
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
@@ -204,16 +205,16 @@ module "gitops_bridge_bootstrap_spoke" {
204205
# GitOps Bridge: Metadata for Hub Cluster
205206
################################################################################
206207
module "gitops_bridge_metadata_hub" {
207-
source = "../../../../../modules/gitops-bridge-metadata"
208+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"
208209

209210
cluster_name = module.eks.cluster_name
210211
environment = local.environment
211212
metadata = local.addons_metadata
212213
addons = local.addons
213214

214215
argocd = {
215-
server = module.eks.cluster_endpoint
216-
argocd_server_config = <<-EOT
216+
server = module.eks.cluster_endpoint
217+
config = <<-EOT
217218
{
218219
"tlsClientConfig": {
219220
"insecure": false,
@@ -233,7 +234,7 @@ module "gitops_bridge_metadata_hub" {
233234
# GitOps Bridge: Bootstrap for Hub Cluster
234235
################################################################################
235236
module "gitops_bridge_bootstrap_hub" {
236-
source = "../../../../../modules/gitops-bridge-bootstrap"
237+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"
237238

238239
# The ArgoCD remote cluster secret is deploy on hub cluster and spoke clusters
239240
providers = {

‎argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/hub/main.tf‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ locals {
7676
oss_addons = {
7777
enable_argocd = false # disable default argocd application set, we enable enable_aws_argocd above
7878
#enable_argo_rollouts = true
79+
#enable_argo_events = true
7980
#enable_argo_workflows = true
8081
#enable_cluster_proportional_autoscaler = true
8182
#enable_gatekeeper = true
@@ -127,7 +128,7 @@ locals {
127128
# GitOps Bridge: Metadata
128129
################################################################################
129130
module "gitops_bridge_metadata" {
130-
source = "../../../../../modules/gitops-bridge-metadata"
131+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"
131132

132133
cluster_name = module.eks.cluster_name
133134
environment = local.environment
@@ -139,7 +140,7 @@ module "gitops_bridge_metadata" {
139140
# GitOps Bridge: Bootstrap
140141
################################################################################
141142
module "gitops_bridge_bootstrap" {
142-
source = "../../../../../modules/gitops-bridge-bootstrap"
143+
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"
143144

144145
argocd_cluster = module.gitops_bridge_metadata.argocd
145146
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps

0 commit comments

Comments
 (0)