moved provider-specific code to toplevel

getupcloud · Dec 4, 2022 · 059eeae · 059eeae
1 parent f48ca66
commit 059eeae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 73 deletions.
diff --git a/kubespray_modules.tf b/kubespray_modules.tf
@@ -5,27 +5,3 @@ resource "local_file" "debug-modules" {
   filename = ".debug-kubespray-modules.json"
   content  = jsonencode(local.modules)
 }
-
-module "cert-manager" {
-  count  = local.modules.cert-manager.enabled ? 1 : 0
-  source = "github.com/getupcloud/terraform-module-cert-manager?ref=v2.0.0-alpha10"
-
-  cluster_name  = var.cluster_name
-  customer_name = var.customer_name
-  provider_name = var.cluster_provider
-  provider_aws = (var.cluster_provider == "aws") ? {
-    hosted_zone_ids : local.modules.cert-manager.hosted_zone_ids
-  } : null
-}
-
-module "velero" {
-  count  = local.modules.velero.enabled ? 1 : 0
-  source = "github.com/getupcloud/terraform-module-velero?ref=v2.0.0-alpha4"
-
-  cluster_name  = var.cluster_name
-  customer_name = var.customer_name
-  provider_name = var.cluster_provider
-  provider_aws = (var.cluster_provider == "aws") ? {
-    bucket_name = local.modules.velero.bucket_name
-  } : null
-}
diff --git a/variables-modules.tf b/variables-modules.tf
@@ -3,58 +3,12 @@
 
 variable "modules_defaults" {
   description = "Configure modules to install (defaults)"
-  type = object({
-    cert-manager = object({
-      enabled         = bool
-      hosted_zone_ids = list(string)
-    })
-    external-dns = object({
-      enabled         = bool
-      private         = bool
-      hosted_zone_ids = list(string)
-      domain_filters  = list(string)
-    })
-    velero = object({
-      enabled     = bool
-      bucket_name = string
-    })
-  })
+  type        = object({})
 
-  default = {
-    cert-manager = {
-      enabled         = false
-      hosted_zone_ids = []
-    }
-    external-dns = {
-      enabled         = false
-      private         = false
-      hosted_zone_ids = []
-      domain_filters  = []
-    }
-    velero = {
-      enabled     = false
-      bucket_name = null
-    }
-  }
+  default = {}
 }
 
 locals {
-  modules = merge(var.modules_defaults, var.modules, {
-    cert-manager = {
-      enabled         = try(var.modules.cert-manager.enabled, var.modules_defaults.cert-manager.enabled)
-      hosted_zone_ids = try(var.modules.cert-manager.hosted_zone_ids, var.modules_defaults.cert-manager.hosted_zone_ids)
-    }
-    external-dns = {
-      enabled         = try(var.modules.external-dns.enabled, var.modules_defaults.external-dns.enabled)
-      private         = try(var.modules.external-dns.private, var.modules_defaults.external-dns.private)
-      hosted_zone_ids = try(var.modules.external-dns.hosted_zone_ids, var.modules_defaults.external-dns.hosted_zone_ids)
-      domain_filters  = try(var.modules.external-dns.domain_filters, var.modules_defaults.external-dns.domain_filters)
-    }
-    velero = {
-      enabled         = try(var.modules.velero.enabled, var.modules_defaults.cert-manager.enabled)
-      hosted_zone_ids = try(var.modules.veloro.bucket_name, var.modules_defaults.velero.bucket_name)
-    }
-  })
-
+  modules          = merge(var.modules_defaults, var.modules, {})
   register_modules = {}
 }