From a4cd2540e00f15a47e4e1417cc7ec8e2e8d3650e Mon Sep 17 00:00:00 2001 From: Carlos Santana Date: Sun, 3 Sep 2023 20:49:33 -0400 Subject: [PATCH 1/2] remove modules and use external github modules Signed-off-by: Carlos Santana --- .../examples/eks/aws-secrets-manager/main.tf | 4 +- .../terraform/examples/eks/complete/main.tf | 4 +- .../terraform/examples/eks/crossplane/main.tf | 4 +- .../examples/eks/external-secrets/main.tf | 4 +- .../examples/eks/hello-world/main.tf | 4 +- .../examples/eks/ingress-alb/main.tf | 4 +- .../eks/multi-cluster/distributed/main.tf | 4 +- .../hub-spoke-shared/hub/main.tf | 4 +- .../hub-spoke-shared/spokes/main.tf | 12 +-- .../eks/multi-cluster/hub-spoke/hub/main.tf | 4 +- .../multi-cluster/hub-spoke/spokes/main.tf | 8 +- .../examples/eks/private-git/main.tf | 4 +- .../modules/gitops-bridge-bootstrap/main.tf | 102 ------------------ .../gitops-bridge-bootstrap/outputs.tf | 0 .../gitops-bridge-bootstrap/variables.tf | 19 ---- .../gitops-bridge-bootstrap/versions.tf | 25 ----- .../modules/gitops-bridge-metadata/main.tf | 63 ----------- .../modules/gitops-bridge-metadata/outputs.tf | 6 -- .../gitops-bridge-metadata/variables.tf | 19 ---- .../gitops-bridge-metadata/versions.tf | 10 -- 20 files changed, 30 insertions(+), 274 deletions(-) delete mode 100644 argocd/iac/terraform/modules/gitops-bridge-bootstrap/main.tf delete mode 100644 argocd/iac/terraform/modules/gitops-bridge-bootstrap/outputs.tf delete mode 100644 argocd/iac/terraform/modules/gitops-bridge-bootstrap/variables.tf delete mode 100644 argocd/iac/terraform/modules/gitops-bridge-bootstrap/versions.tf delete mode 100644 argocd/iac/terraform/modules/gitops-bridge-metadata/main.tf delete mode 100644 argocd/iac/terraform/modules/gitops-bridge-metadata/outputs.tf delete mode 100644 argocd/iac/terraform/modules/gitops-bridge-metadata/variables.tf delete mode 100644 argocd/iac/terraform/modules/gitops-bridge-metadata/versions.tf diff --git a/argocd/iac/terraform/examples/eks/aws-secrets-manager/main.tf b/argocd/iac/terraform/examples/eks/aws-secrets-manager/main.tf index acc1ca3b..24dad468 100644 --- a/argocd/iac/terraform/examples/eks/aws-secrets-manager/main.tf +++ b/argocd/iac/terraform/examples/eks/aws-secrets-manager/main.tf @@ -125,7 +125,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 @@ -137,7 +137,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 diff --git a/argocd/iac/terraform/examples/eks/complete/main.tf b/argocd/iac/terraform/examples/eks/complete/main.tf index cd29e413..294c831d 100644 --- a/argocd/iac/terraform/examples/eks/complete/main.tf +++ b/argocd/iac/terraform/examples/eks/complete/main.tf @@ -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 @@ -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 diff --git a/argocd/iac/terraform/examples/eks/crossplane/main.tf b/argocd/iac/terraform/examples/eks/crossplane/main.tf index 51ab53f8..2f5d719e 100644 --- a/argocd/iac/terraform/examples/eks/crossplane/main.tf +++ b/argocd/iac/terraform/examples/eks/crossplane/main.tf @@ -132,7 +132,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 @@ -144,7 +144,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 diff --git a/argocd/iac/terraform/examples/eks/external-secrets/main.tf b/argocd/iac/terraform/examples/eks/external-secrets/main.tf index 9a681ea3..4ea6f77c 100644 --- a/argocd/iac/terraform/examples/eks/external-secrets/main.tf +++ b/argocd/iac/terraform/examples/eks/external-secrets/main.tf @@ -171,7 +171,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 @@ -183,7 +183,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 diff --git a/argocd/iac/terraform/examples/eks/hello-world/main.tf b/argocd/iac/terraform/examples/eks/hello-world/main.tf index 1b69c075..b2f21eeb 100644 --- a/argocd/iac/terraform/examples/eks/hello-world/main.tf +++ b/argocd/iac/terraform/examples/eks/hello-world/main.tf @@ -122,7 +122,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 @@ -134,7 +134,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 diff --git a/argocd/iac/terraform/examples/eks/ingress-alb/main.tf b/argocd/iac/terraform/examples/eks/ingress-alb/main.tf index a66208ed..5fc091f2 100644 --- a/argocd/iac/terraform/examples/eks/ingress-alb/main.tf +++ b/argocd/iac/terraform/examples/eks/ingress-alb/main.tf @@ -140,7 +140,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 @@ -152,7 +152,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 diff --git a/argocd/iac/terraform/examples/eks/multi-cluster/distributed/main.tf b/argocd/iac/terraform/examples/eks/multi-cluster/distributed/main.tf index aca21a00..cc9841e2 100644 --- a/argocd/iac/terraform/examples/eks/multi-cluster/distributed/main.tf +++ b/argocd/iac/terraform/examples/eks/multi-cluster/distributed/main.tf @@ -126,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 @@ -138,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 diff --git a/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/hub/main.tf b/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/hub/main.tf index e21e29ee..452df85b 100644 --- a/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/hub/main.tf +++ b/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/hub/main.tf @@ -127,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 @@ -139,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 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 index 0a43dda6..a5e6f782 100644 --- 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 @@ -170,7 +170,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 @@ -190,7 +190,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 @@ -204,7 +204,7 @@ 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 @@ -212,8 +212,8 @@ module "gitops_bridge_metadata_hub" { addons = local.addons argocd = { - server = module.eks.cluster_endpoint - argocd_server_config = <<-EOT + server = module.eks.cluster_endpoint + config = <<-EOT { "tlsClientConfig": { "insecure": false, @@ -233,7 +233,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 = { diff --git a/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/hub/main.tf b/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/hub/main.tf index a935ee21..ada0a3f5 100644 --- a/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/hub/main.tf +++ b/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/hub/main.tf @@ -127,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 @@ -139,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 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 index 7331bfa3..8ee4bf8b 100644 --- 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 @@ -145,7 +145,7 @@ 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 @@ -153,8 +153,8 @@ module "gitops_bridge_metadata_hub" { addons = local.addons argocd = { - server = module.eks.cluster_endpoint - argocd_server_config = <<-EOT + server = module.eks.cluster_endpoint + config = <<-EOT { "tlsClientConfig": { "insecure": false, @@ -173,7 +173,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 = { diff --git a/argocd/iac/terraform/examples/eks/private-git/main.tf b/argocd/iac/terraform/examples/eks/private-git/main.tf index 49883bb6..b21d7279 100644 --- a/argocd/iac/terraform/examples/eks/private-git/main.tf +++ b/argocd/iac/terraform/examples/eks/private-git/main.tf @@ -171,7 +171,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 @@ -183,7 +183,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 diff --git a/argocd/iac/terraform/modules/gitops-bridge-bootstrap/main.tf b/argocd/iac/terraform/modules/gitops-bridge-bootstrap/main.tf deleted file mode 100644 index 8d2e502c..00000000 --- a/argocd/iac/terraform/modules/gitops-bridge-bootstrap/main.tf +++ /dev/null @@ -1,102 +0,0 @@ -################################################################################ -# Install ArgoCD -################################################################################ -resource "helm_release" "argocd" { - count = var.argocd_create_install ? 1 : 0 - - # https://github.com/argoproj/argo-helm/blob/main/charts/argo-cd/Chart.yaml - # (there is no offical helm chart for argocd) - name = try(var.argocd.name, "argo-cd") - description = try(var.argocd.description, "A Helm chart to install the ArgoCD") - namespace = try(var.argocd.namespace, "argocd") - create_namespace = try(var.argocd.create_namespace, true) - chart = try(var.argocd.chart,"argo-cd") - version = try(var.argocd.chart_version, "5.45.0") - repository = try(var.argocd.repository, "https://argoproj.github.io/argo-helm") - values = try(var.argocd.values, []) - - timeout = try(var.argocd.timeout, null) - repository_key_file = try(var.argocd.repository_key_file, null) - repository_cert_file = try(var.argocd.repository_cert_file, null) - repository_ca_file = try(var.argocd.repository_ca_file, null) - repository_username = try(var.argocd.repository_username, null) - repository_password = try(var.argocd.repository_password, null) - devel = try(var.argocd.devel, null) - verify = try(var.argocd.verify, null) - keyring = try(var.argocd.keyring, null) - disable_webhooks = try(var.argocd.disable_webhooks, null) - reuse_values = try(var.argocd.reuse_values, null) - reset_values = try(var.argocd.reset_values, null) - force_update = try(var.argocd.force_update, null) - recreate_pods = try(var.argocd.recreate_pods, null) - cleanup_on_fail = try(var.argocd.cleanup_on_fail, null) - max_history = try(var.argocd.max_history, null) - atomic = try(var.argocd.atomic, null) - skip_crds = try(var.argocd.skip_crds, null) - render_subchart_notes = try(var.argocd.render_subchart_notes, null) - disable_openapi_validation = try(var.argocd.disable_openapi_validation, null) - wait = try(var.argocd.wait, true) - wait_for_jobs = try(var.argocd.wait_for_jobs, null) - dependency_update = try(var.argocd.dependency_update, null) - replace = try(var.argocd.replace, null) - lint = try(var.argocd.lint, null) - - dynamic "postrender" { - for_each = length(try(var.argocd.postrender,{})) > 0 ? [var.argocd.postrender] : [] - - content { - binary_path = postrender.value.binary_path - args = try(postrender.value.args, null) - } - } - - dynamic "set" { - for_each = try(var.argocd.set,[]) - - content { - name = set.value.name - value = set.value.value - type = try(set.value.type, null) - } - } - - dynamic "set_sensitive" { - for_each = try(var.argocd.set_sensitive, []) - - content { - name = set_sensitive.value.name - value = set_sensitive.value.value - type = try(set_sensitive.value.type, null) - } - } - -} - -resource "kubernetes_secret_v1" "cluster" { - count = var.argocd_cluster != null ? 1 : 0 - - metadata { - name = var.argocd_cluster.metadata.name - namespace = var.argocd_cluster.metadata.namespace - annotations = var.argocd_cluster.metadata.annotations - labels = var.argocd_cluster.metadata.labels - } - data = var.argocd_cluster.stringData - - depends_on = [ helm_release.argocd ] - -} - - -################################################################################ -# Create App of Apps -################################################################################ -resource "kubectl_manifest" "bootstrap" { - for_each = var.argocd_bootstrap_app_of_apps - - yaml_body = each.value - - depends_on = [ resource.kubernetes_secret_v1.cluster ] -} - - diff --git a/argocd/iac/terraform/modules/gitops-bridge-bootstrap/outputs.tf b/argocd/iac/terraform/modules/gitops-bridge-bootstrap/outputs.tf deleted file mode 100644 index e69de29b..00000000 diff --git a/argocd/iac/terraform/modules/gitops-bridge-bootstrap/variables.tf b/argocd/iac/terraform/modules/gitops-bridge-bootstrap/variables.tf deleted file mode 100644 index 4d309279..00000000 --- a/argocd/iac/terraform/modules/gitops-bridge-bootstrap/variables.tf +++ /dev/null @@ -1,19 +0,0 @@ -variable "argocd" { - description = "argocd helm options" - default = {} -} - -variable "argocd_create_install" { - description = "deploy argocd helm" - default = true -} - -variable "argocd_cluster" { - description = "argocd cluster secret" - default = null -} - -variable "argocd_bootstrap_app_of_apps" { - description = "argocd app of apps to deploy" - default = {} -} \ No newline at end of file diff --git a/argocd/iac/terraform/modules/gitops-bridge-bootstrap/versions.tf b/argocd/iac/terraform/modules/gitops-bridge-bootstrap/versions.tf deleted file mode 100644 index d3ed982a..00000000 --- a/argocd/iac/terraform/modules/gitops-bridge-bootstrap/versions.tf +++ /dev/null @@ -1,25 +0,0 @@ -terraform { - required_version = ">= 1.0" - - required_providers { - helm = { - source = "hashicorp/helm" - version = ">= 2.10.1" - } - kubectl = { - source = "gavinbunney/kubectl" - version = ">= 1.14" - } - kubernetes = { - source = "hashicorp/kubernetes" - version = ">= 2.22.0" - } - } - - # ## Used for end-to-end testing on project; update to suit your needs - # backend "s3" { - # bucket = "terraform-ssp-github-actions-state" - # region = "us-west-2" - # key = "e2e/ipv4-prefix-delegation/terraform.tfstate" - # } -} diff --git a/argocd/iac/terraform/modules/gitops-bridge-metadata/main.tf b/argocd/iac/terraform/modules/gitops-bridge-metadata/main.tf deleted file mode 100644 index 7e3f3d35..00000000 --- a/argocd/iac/terraform/modules/gitops-bridge-metadata/main.tf +++ /dev/null @@ -1,63 +0,0 @@ - -locals { - - argocd_labels = merge ({ - cluster_name = var.cluster_name - environment = var.environment - enable_argocd = true - "argocd.argoproj.io/secret-type" = "cluster" - }, - var.addons - ) - argocd_annotations = merge( - { - cluster_name = var.cluster_name - environment = var.environment - }, - var.metadata - ) - fluxcd_data = merge( - { - cluster_name = var.cluster_name - environment = var.environment - }, - var.metadata - ) -} - -locals { - argocd_server_config = <<-EOT - { - "tlsClientConfig": { - "insecure": false - } - } - EOT - argocd = { - apiVersion = "v1" - kind = "Secret" - metadata = { - name = try(var.argocd.secret_name,var.cluster_name) - namespace = try(var.argocd.secret_namespace,"argocd") - annotations = local.argocd_annotations - labels = local.argocd_labels - } - stringData = { - name = var.cluster_name - server = try(var.argocd.server,"https://kubernetes.default.svc") - config = try(var.argocd.argocd_server_config,local.argocd_server_config) - } - } -} - -locals { - fluxcd = { - apiVersion = "v1" - kind = "ConfigMap" - metadata = { - name = try(var.fluxcd.configmap_name,var.cluster_name) - namespace = try(var.fluxcd.configmap_namespace,"flux-system") - } - data = local.fluxcd_data - } -} \ No newline at end of file diff --git a/argocd/iac/terraform/modules/gitops-bridge-metadata/outputs.tf b/argocd/iac/terraform/modules/gitops-bridge-metadata/outputs.tf deleted file mode 100644 index fee540a7..00000000 --- a/argocd/iac/terraform/modules/gitops-bridge-metadata/outputs.tf +++ /dev/null @@ -1,6 +0,0 @@ -output "argocd" { - value = local.argocd -} -output "fluxcd" { - value = local.fluxcd -} diff --git a/argocd/iac/terraform/modules/gitops-bridge-metadata/variables.tf b/argocd/iac/terraform/modules/gitops-bridge-metadata/variables.tf deleted file mode 100644 index 4767caca..00000000 --- a/argocd/iac/terraform/modules/gitops-bridge-metadata/variables.tf +++ /dev/null @@ -1,19 +0,0 @@ -variable "cluster_name" { - default = "in-cluster" -} -variable "environment" { - default = "dev" -} -variable "metadata" { - default = {} -} -variable "addons" { - default = {} -} -variable "argocd" { - default = {} -} -variable "fluxcd" { - default = {} -} - diff --git a/argocd/iac/terraform/modules/gitops-bridge-metadata/versions.tf b/argocd/iac/terraform/modules/gitops-bridge-metadata/versions.tf deleted file mode 100644 index 25a03f61..00000000 --- a/argocd/iac/terraform/modules/gitops-bridge-metadata/versions.tf +++ /dev/null @@ -1,10 +0,0 @@ -terraform { - required_version = ">= 1.0" - - # ## Used for end-to-end testing on project; update to suit your needs - # backend "s3" { - # bucket = "terraform-ssp-github-actions-state" - # region = "us-west-2" - # key = "e2e/ipv4-prefix-delegation/terraform.tfstate" - # } -} From 81b4fdacc775ab8b1ba528a80ecc4177dd8d8215 Mon Sep 17 00:00:00 2001 From: Carlos Santana Date: Sun, 3 Sep 2023 21:28:41 -0400 Subject: [PATCH 2/2] add argo events placeholder Signed-off-by: Carlos Santana --- argocd/iac/terraform/examples/eks/aws-secrets-manager/main.tf | 1 + argocd/iac/terraform/examples/eks/crossplane/main.tf | 1 + argocd/iac/terraform/examples/eks/external-secrets/main.tf | 1 + argocd/iac/terraform/examples/eks/hello-world/main.tf | 1 + argocd/iac/terraform/examples/eks/ingress-alb/main.tf | 1 + .../iac/terraform/examples/eks/multi-cluster/distributed/main.tf | 1 + .../examples/eks/multi-cluster/hub-spoke-shared/hub/main.tf | 1 + .../examples/eks/multi-cluster/hub-spoke-shared/spokes/main.tf | 1 + .../terraform/examples/eks/multi-cluster/hub-spoke/hub/main.tf | 1 + .../examples/eks/multi-cluster/hub-spoke/spokes/main.tf | 1 + argocd/iac/terraform/examples/eks/private-git/main.tf | 1 + 11 files changed, 11 insertions(+) diff --git a/argocd/iac/terraform/examples/eks/aws-secrets-manager/main.tf b/argocd/iac/terraform/examples/eks/aws-secrets-manager/main.tf index 24dad468..19b9d67d 100644 --- a/argocd/iac/terraform/examples/eks/aws-secrets-manager/main.tf +++ b/argocd/iac/terraform/examples/eks/aws-secrets-manager/main.tf @@ -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 diff --git a/argocd/iac/terraform/examples/eks/crossplane/main.tf b/argocd/iac/terraform/examples/eks/crossplane/main.tf index 2f5d719e..0225b8a0 100644 --- a/argocd/iac/terraform/examples/eks/crossplane/main.tf +++ b/argocd/iac/terraform/examples/eks/crossplane/main.tf @@ -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 diff --git a/argocd/iac/terraform/examples/eks/external-secrets/main.tf b/argocd/iac/terraform/examples/eks/external-secrets/main.tf index 4ea6f77c..8cd5511c 100644 --- a/argocd/iac/terraform/examples/eks/external-secrets/main.tf +++ b/argocd/iac/terraform/examples/eks/external-secrets/main.tf @@ -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 diff --git a/argocd/iac/terraform/examples/eks/hello-world/main.tf b/argocd/iac/terraform/examples/eks/hello-world/main.tf index b2f21eeb..e439be22 100644 --- a/argocd/iac/terraform/examples/eks/hello-world/main.tf +++ b/argocd/iac/terraform/examples/eks/hello-world/main.tf @@ -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 diff --git a/argocd/iac/terraform/examples/eks/ingress-alb/main.tf b/argocd/iac/terraform/examples/eks/ingress-alb/main.tf index 5fc091f2..7e08b320 100644 --- a/argocd/iac/terraform/examples/eks/ingress-alb/main.tf +++ b/argocd/iac/terraform/examples/eks/ingress-alb/main.tf @@ -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 diff --git a/argocd/iac/terraform/examples/eks/multi-cluster/distributed/main.tf b/argocd/iac/terraform/examples/eks/multi-cluster/distributed/main.tf index cc9841e2..06087b93 100644 --- a/argocd/iac/terraform/examples/eks/multi-cluster/distributed/main.tf +++ b/argocd/iac/terraform/examples/eks/multi-cluster/distributed/main.tf @@ -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 diff --git a/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/hub/main.tf b/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/hub/main.tf index 452df85b..938fb3b5 100644 --- a/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/hub/main.tf +++ b/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke-shared/hub/main.tf @@ -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 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 index a5e6f782..8f49c9b9 100644 --- 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 @@ -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 diff --git a/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/hub/main.tf b/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/hub/main.tf index ada0a3f5..f0b6fd95 100644 --- a/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/hub/main.tf +++ b/argocd/iac/terraform/examples/eks/multi-cluster/hub-spoke/hub/main.tf @@ -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 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 index 8ee4bf8b..54113f57 100644 --- 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 @@ -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 diff --git a/argocd/iac/terraform/examples/eks/private-git/main.tf b/argocd/iac/terraform/examples/eks/private-git/main.tf index b21d7279..821c3300 100644 --- a/argocd/iac/terraform/examples/eks/private-git/main.tf +++ b/argocd/iac/terraform/examples/eks/private-git/main.tf @@ -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