Skip to content

feat: Remove modules and use external github modules for metadata and bootstrap #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 4, 2023
Merged

feat: Remove modules and use external github modules for metadata and bootstrap #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4cd254
remove modules and use external github modules
csantanapr Sep 4, 2023
81b4fda
add argo events placeholder
csantanapr Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions argocd/iac/terraform/examples/eks/aws-secrets-manager/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ locals {
}
oss_addons = {
#enable_argo_rollouts = true
#enable_argo_events = true
#enable_argo_workflows = true
#enable_cluster_proportional_autoscaler = true
#enable_gatekeeper = true
Expand Down Expand Up @@ -125,7 +126,7 @@ locals {
# GitOps Bridge: Metadata
################################################################################
module "gitops_bridge_metadata" {
source = "../../../modules/gitops-bridge-metadata"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"

cluster_name = module.eks.cluster_name
environment = local.environment
Expand All @@ -137,7 +138,7 @@ module "gitops_bridge_metadata" {
# GitOps Bridge: Bootstrap
################################################################################
module "gitops_bridge_bootstrap" {
source = "../../../modules/gitops-bridge-bootstrap"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"

argocd_cluster = module.gitops_bridge_metadata.argocd
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
Expand Down
4 changes: 2 additions & 2 deletions argocd/iac/terraform/examples/eks/complete/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ locals {
# GitOps Bridge: Metadata
################################################################################
module "gitops_bridge_metadata" {
source = "../../../modules/gitops-bridge-metadata"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"

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

argocd_cluster = module.gitops_bridge_metadata.argocd
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
Expand Down
5 changes: 3 additions & 2 deletions argocd/iac/terraform/examples/eks/crossplane/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ locals {
enable_crossplane = true # installs crossplane core
enable_metrics_server = true
#enable_argo_rollouts = true
#enable_argo_events = true
#enable_argo_workflows = true
#enable_cluster_proportional_autoscaler = true
#enable_gatekeeper = true
Expand Down Expand Up @@ -132,7 +133,7 @@ locals {
# GitOps Bridge: Metadata
################################################################################
module "gitops_bridge_metadata" {
source = "../../../modules/gitops-bridge-metadata"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"

cluster_name = module.eks.cluster_name
environment = local.environment
Expand All @@ -144,7 +145,7 @@ module "gitops_bridge_metadata" {
# GitOps Bridge: Bootstrap
################################################################################
module "gitops_bridge_bootstrap" {
source = "../../../modules/gitops-bridge-bootstrap"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"

argocd_cluster = module.gitops_bridge_metadata.argocd
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
Expand Down
5 changes: 3 additions & 2 deletions argocd/iac/terraform/examples/eks/external-secrets/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ locals {
}
oss_addons = {
#enable_argo_rollouts = true
#enable_argo_events = true
#enable_argo_workflows = true
#enable_cluster_proportional_autoscaler = true
#enable_gatekeeper = true
Expand Down Expand Up @@ -171,7 +172,7 @@ resource "aws_ssm_parameter" "secret_parameter" {
# GitOps Bridge: Metadata
################################################################################
module "gitops_bridge_metadata" {
source = "../../../modules/gitops-bridge-metadata"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"

cluster_name = module.eks.cluster_name
environment = local.environment
Expand All @@ -183,7 +184,7 @@ module "gitops_bridge_metadata" {
# GitOps Bridge: Bootstrap
################################################################################
module "gitops_bridge_bootstrap" {
source = "../../../modules/gitops-bridge-bootstrap"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"

argocd_cluster = module.gitops_bridge_metadata.argocd
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
Expand Down
5 changes: 3 additions & 2 deletions argocd/iac/terraform/examples/eks/hello-world/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ locals {
}
oss_addons = {
#enable_argo_rollouts = true
#enable_argo_events = true
#enable_argo_workflows = true
#enable_cluster_proportional_autoscaler = true
#enable_gatekeeper = true
Expand Down Expand Up @@ -122,7 +123,7 @@ locals {
# GitOps Bridge: Metadata
################################################################################
module "gitops_bridge_metadata" {
source = "../../../modules/gitops-bridge-metadata"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"

cluster_name = module.eks.cluster_name
environment = local.environment
Expand All @@ -134,7 +135,7 @@ module "gitops_bridge_metadata" {
# GitOps Bridge: Bootstrap
################################################################################
module "gitops_bridge_bootstrap" {
source = "../../../modules/gitops-bridge-bootstrap"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"

argocd_cluster = module.gitops_bridge_metadata.argocd
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
Expand Down
5 changes: 3 additions & 2 deletions argocd/iac/terraform/examples/eks/ingress-alb/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ locals {
oss_addons = {
enable_argocd = false # disable default argocd application set, we enable enable_aws_argocd_ingress above
#enable_argo_rollouts = true
#enable_argo_events = true
#enable_argo_workflows = true
#enable_cluster_proportional_autoscaler = true
#enable_gatekeeper = true
Expand Down Expand Up @@ -140,7 +141,7 @@ locals {
# GitOps Bridge: Metadata
################################################################################
module "gitops_bridge_metadata" {
source = "../../../modules/gitops-bridge-metadata"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"

cluster_name = module.eks.cluster_name
environment = local.environment
Expand All @@ -152,7 +153,7 @@ module "gitops_bridge_metadata" {
# GitOps Bridge: Bootstrap
################################################################################
module "gitops_bridge_bootstrap" {
source = "../../../modules/gitops-bridge-bootstrap"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"

argocd_cluster = module.gitops_bridge_metadata.argocd
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
Expand Down
5 changes: 3 additions & 2 deletions argocd/iac/terraform/examples/eks/multi-cluster/distributed/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ locals {
}
oss_addons = {
#enable_argo_rollouts = true
#enable_argo_events = true
#enable_argo_workflows = true
#enable_cluster_proportional_autoscaler = true
#enable_gatekeeper = true
Expand Down Expand Up @@ -126,7 +127,7 @@ locals {
# GitOps Bridge: Metadata
################################################################################
module "gitops_bridge_metadata" {
source = "../../../../modules/gitops-bridge-metadata"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"

cluster_name = module.eks.cluster_name
environment = local.environment
Expand All @@ -138,7 +139,7 @@ module "gitops_bridge_metadata" {
# GitOps Bridge: Bootstrap
################################################################################
module "gitops_bridge_bootstrap" {
source = "../../../../modules/gitops-bridge-bootstrap"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"

argocd_cluster = module.gitops_bridge_metadata.argocd
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
Expand Down
5 changes: 3 additions & 2 deletions argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/hub/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ locals {
oss_addons = {
enable_argocd = false # disable default argocd application set, we enable enable_aws_argocd above
#enable_argo_rollouts = true
#enable_argo_events = true
#enable_argo_workflows = true
#enable_cluster_proportional_autoscaler = true
#enable_gatekeeper = true
Expand Down Expand Up @@ -127,7 +128,7 @@ locals {
# GitOps Bridge: Metadata
################################################################################
module "gitops_bridge_metadata" {
source = "../../../../../modules/gitops-bridge-metadata"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"

cluster_name = module.eks.cluster_name
environment = local.environment
Expand All @@ -139,7 +140,7 @@ module "gitops_bridge_metadata" {
# GitOps Bridge: Bootstrap
################################################################################
module "gitops_bridge_bootstrap" {
source = "../../../../../modules/gitops-bridge-bootstrap"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"

argocd_cluster = module.gitops_bridge_metadata.argocd
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
Expand Down
13 changes: 7 additions & 6 deletions argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/spokes/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ locals {
}
oss_addons = {
#enable_argo_rollouts = true
#enable_argo_events = true
#enable_argo_workflows = true
#enable_cluster_proportional_autoscaler = true
#enable_gatekeeper = true
Expand Down Expand Up @@ -170,7 +171,7 @@ locals {
# GitOps Bridge: Metadata for Spoke Cluster
################################################################################
module "gitops_bridge_metadata_spoke" {
source = "../../../../../modules/gitops-bridge-metadata"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"

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

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

cluster_name = module.eks.cluster_name
environment = local.environment
metadata = local.addons_metadata
addons = local.addons

argocd = {
server = module.eks.cluster_endpoint
argocd_server_config = <<-EOT
server = module.eks.cluster_endpoint
config = <<-EOT
{
"tlsClientConfig": {
"insecure": false,
Expand All @@ -233,7 +234,7 @@ module "gitops_bridge_metadata_hub" {
# GitOps Bridge: Bootstrap for Hub Cluster
################################################################################
module "gitops_bridge_bootstrap_hub" {
source = "../../../../../modules/gitops-bridge-bootstrap"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"

# The ArgoCD remote cluster secret is deploy on hub cluster and spoke clusters
providers = {
Expand Down
5 changes: 3 additions & 2 deletions argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/hub/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ locals {
oss_addons = {
enable_argocd = false # disable default argocd application set, we enable enable_aws_argocd above
#enable_argo_rollouts = true
#enable_argo_events = true
#enable_argo_workflows = true
#enable_cluster_proportional_autoscaler = true
#enable_gatekeeper = true
Expand Down Expand Up @@ -127,7 +128,7 @@ locals {
# GitOps Bridge: Metadata
################################################################################
module "gitops_bridge_metadata" {
source = "../../../../../modules/gitops-bridge-metadata"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"

cluster_name = module.eks.cluster_name
environment = local.environment
Expand All @@ -139,7 +140,7 @@ module "gitops_bridge_metadata" {
# GitOps Bridge: Bootstrap
################################################################################
module "gitops_bridge_bootstrap" {
source = "../../../../../modules/gitops-bridge-bootstrap"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"

argocd_cluster = module.gitops_bridge_metadata.argocd
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
Expand Down
9 changes: 5 additions & 4 deletions argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/spokes/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ locals {
oss_addons = {
enable_argocd = false # we are not deploying argocd to spoke clusters
#enable_argo_rollouts = true
#enable_argo_events = true
#enable_argo_workflows = true
#enable_cluster_proportional_autoscaler = true
#enable_gatekeeper = true
Expand Down Expand Up @@ -145,16 +146,16 @@ locals {
# GitOps Bridge: Metadata for Spoke Cluster
################################################################################
module "gitops_bridge_metadata_hub" {
source = "../../../../../modules/gitops-bridge-metadata"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"

cluster_name = module.eks.cluster_name
environment = local.environment
metadata = local.addons_metadata
addons = local.addons

argocd = {
server = module.eks.cluster_endpoint
argocd_server_config = <<-EOT
server = module.eks.cluster_endpoint
config = <<-EOT
{
"tlsClientConfig": {
"insecure": false,
Expand All @@ -173,7 +174,7 @@ module "gitops_bridge_metadata_hub" {
# GitOps Bridge: Bootstrap for Hub Cluster
################################################################################
module "gitops_bridge_bootstrap_hub" {
source = "../../../../../modules/gitops-bridge-bootstrap"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"

# The ArgoCD remote cluster secret is deploy on hub cluster not on spoke clusters
providers = {
Expand Down
5 changes: 3 additions & 2 deletions argocd/iac/terraform/examples/eks/private-git/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ locals {
}
oss_addons = {
#enable_argo_rollouts = true
#enable_argo_events = true
#enable_argo_workflows = true
#enable_cluster_proportional_autoscaler = true
#enable_gatekeeper = true
Expand Down Expand Up @@ -171,7 +172,7 @@ resource "kubernetes_secret" "git_secrets" {
# GitOps Bridge: Metadata
################################################################################
module "gitops_bridge_metadata" {
source = "../../../modules/gitops-bridge-metadata"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-metadata-terraform?ref=v1.0.0"

cluster_name = module.eks.cluster_name
environment = local.environment
Expand All @@ -183,7 +184,7 @@ module "gitops_bridge_metadata" {
# GitOps Bridge: Bootstrap
################################################################################
module "gitops_bridge_bootstrap" {
source = "../../../modules/gitops-bridge-bootstrap"
source = "github.com/gitops-bridge-dev/gitops-bridge-argocd-bootstrap-terraform?ref=v1.0.0"

argocd_cluster = module.gitops_bridge_metadata.argocd
argocd_bootstrap_app_of_apps = local.argocd_bootstrap_app_of_apps
Expand Down
Loading