Remove wildcard certificate generation

ComputeCanada · Jul 22, 2024 · bfcde3a · bfcde3a
1 parent 32e4bc2
commit bfcde3a
Show file tree

Hide file tree

Showing 18 changed files with 1 addition and 306 deletions.
diff --git a/dns/acme/main.tf b/dns/acme/main.tf
diff --git a/dns/acme/versions.tf b/dns/acme/versions.tf
diff --git a/dns/cloudflare/main.tf b/dns/cloudflare/main.tf
@@ -35,21 +35,6 @@ resource "cloudflare_record" "records" {
   }
 }
 
-module "acme" {
-  count            = var.issue_wildcard_cert ? 1 : 0
-  source           = "../acme"
-  dns_provider     = "cloudflare"
-  name             = lower(var.name)
-  domain           = var.domain
-  email            = var.email
-  sudoer_username  = var.sudoer_username
-  bastions         = var.bastions
-  public_instances = var.public_instances
-  ssh_private_key  = var.ssh_private_key
-  ssl_tags         = var.ssl_tags
-  acme_key_pem     = var.acme_key_pem
-}
-
 output "hostnames" {
   value = distinct(compact([for record in module.record_generator.records : join(".", [record.name, var.domain]) if record.type == "A" ]))
 }
diff --git a/dns/cloudflare/variables.tf b/dns/cloudflare/variables.tf
@@ -4,25 +4,6 @@ variable "name" {
 variable "domain" {
 }
 
-variable "email" {
-  description = "Define the email address used to issue the wildcard certificate. This address will get certificate expiration reminder."
-  type    = string
-  default = ""
-}
-
-variable "issue_wildcard_cert" {
-  description = "Use DNS-01 challenge to generate a wildcard certificate *.name.domain_name"
-  default     = false
-}
-
-variable "acme_key_pem" {
-  type = string
-  default = ""
-}
-
-variable "sudoer_username" {
-}
-
 variable "vhosts" {
   description = "List of vhost dns records to create as vhost.name.domain_name."
   type    = list(string)
@@ -39,15 +20,4 @@ variable "vhost_tag" {
   default = "proxy"
 }
 
-variable "ssl_tags" {
-  description = "Define a list of tags the instances that will receive a copy of the wildcard SSL certificate can have."
-  default = ["proxy", "ssl"]
-}
-
 variable "public_instances" { }
-
-variable "bastions" { }
-
-variable "ssh_private_key" {
-  type = string
-}
diff --git a/dns/gcloud/main.tf b/dns/gcloud/main.tf
@@ -31,24 +31,6 @@ resource "google_dns_record_set" "records" {
   ttl          = 300
 }
 
-module "acme" {
-  count               = var.issue_wildcard_cert ? 1 : 0
-  source              = "../acme"
-  dns_provider        = "gcloud"
-  dns_provider_config = {
-    GCE_PROJECT = var.project
-  }
-  name                = lower(var.name)
-  domain              = var.domain
-  email               = var.email
-  sudoer_username     = var.sudoer_username
-  bastions            = var.bastions
-  public_instances    = var.public_instances
-  ssh_private_key     = var.ssh_private_key
-  ssl_tags            = var.ssl_tags
-  acme_key_pem        = var.acme_key_pem
-}
-
 output "hostnames" {
   value = distinct(compact([for record in module.record_generator.records : join(".", [record.name, var.domain]) if record.type == "A" ]))
 }
diff --git a/dns/gcloud/variables.tf b/dns/gcloud/variables.tf
@@ -10,25 +10,6 @@ variable "name" {
 variable "domain" {
 }
 
-variable "email" {
-  description = "Define the email address used to issue the wildcard certificate. This address will get certificate expiration reminder."
-  type        = string
-  default     = ""
-}
-
-variable "issue_wildcard_cert" {
-  description = "Use DNS-01 challenge to generate a wildcard certificate *.name.domain_name"
-  default     = false
-}
-
-variable "acme_key_pem" {
-  type = string
-  default = ""
-}
-
-variable "sudoer_username" {
-}
-
 variable "vhosts" {
   description = "List of vhost dns records to create as vhost.name.domain_name."
   type    = list(string)
@@ -45,15 +26,4 @@ variable "vhost_tag" {
   default = "proxy"
 }
 
-variable "ssl_tags" {
-  description = "Define a list of tags the instances that will receive a copy of the wildcard SSL certificate can have."
-  default = ["proxy", "ssl"]
-}
-
 variable "public_instances" { }
-
-variable "bastions" { }
-
-variable "ssh_private_key" {
-  type = string
-}
diff --git a/dns/txt/variables.tf b/dns/txt/variables.tf
@@ -20,4 +20,4 @@ variable "vhosts" {
   description = "List of vhost records A to create."
   type    = list(string)
   default = ["ipa", "jupyter", "mokey", "explore"]
-}
+}
diff --git a/examples/advanced/basic_puppet/openstack/main.tf b/examples/advanced/basic_puppet/openstack/main.tf
@@ -35,10 +35,7 @@ output "sudoer" {
 #   source           = "git::https://github.com/ComputeCanada/magic_castle.git//dns/cloudflare"
 #   name             = module.openstack.cluster_name
 #   domain           = module.openstack.domain
-#   bastions         = module.openstack.bastions
 #   public_instances = module.openstack.public_instances
-#   ssh_private_key  = module.openstack.ssh_private_key
-#   sudoer_username  = module.openstack.accounts.sudoer.username
 # }
 
 ## Uncomment to register your domain name with Google Cloud
@@ -48,10 +45,7 @@ output "sudoer" {
 #   zone_name        = "you-zone-name"
 #   name             = module.openstack.cluster_name
 #   domain           = module.openstack.domain
-#   bastions         = module.openstack.bastions
 #   public_instances = module.openstack.public_instances
-#   ssh_private_key  = module.openstack.ssh_private_key
-#   sudoer_username  = module.openstack.accounts.sudoer.username
 # }
 
 # output "hostnames" {

diff --git a/examples/advanced/k8s/openstack/main.tf b/examples/advanced/k8s/openstack/main.tf
@@ -35,10 +35,7 @@ output "public_ip" {
 #   source           = "git::https://github.com/ComputeCanada/magic_castle.git//dns/cloudflare"
 #   name             = module.openstack.cluster_name
 #   domain           = module.openstack.domain
-#   bastions         = module.openstack.bastions
 #   public_instances = module.openstack.public_instances
-#   ssh_private_key  = module.openstack.ssh_private_key
-#   sudoer_username  = module.openstack.accounts.sudoer.username
 # }
 
 ## Uncomment to register your domain name with Google Cloud
@@ -48,10 +45,7 @@ output "public_ip" {
 #   zone_name        = "you-zone-name"
 #   name             = module.openstack.cluster_name
 #   domain           = module.openstack.domain
-#   bastions         = module.openstack.bastions
 #   public_instances = module.openstack.public_instances
-#   ssh_private_key  = module.openstack.ssh_private_key
-#   sudoer_username  = module.openstack.accounts.sudoer.username
 # }
 
 # output "hostnames" {

diff --git a/examples/advanced/lustre/openstack/main.tf b/examples/advanced/lustre/openstack/main.tf
@@ -44,10 +44,7 @@ output "sudoer" {
 #   source           = "git::https://github.com/ComputeCanada/magic_castle.git//dns/cloudflare"
 #   name             = module.openstack.cluster_name
 #   domain           = module.openstack.domain
-#   bastions         = module.openstack.bastions
 #   public_instances = module.openstack.public_instances
-#   ssh_private_key  = module.openstack.ssh_private_key
-#   sudoer_username  = module.openstack.accounts.sudoer.username
 # }
 
 ## Uncomment to register your domain name with Google Cloud
@@ -57,10 +54,7 @@ output "sudoer" {
 #   zone_name        = "you-zone-name"
 #   name             = module.openstack.cluster_name
 #   domain           = module.openstack.domain
-#   bastions         = module.openstack.bastions
 #   public_instances = module.openstack.public_instances
-#   ssh_private_key  = module.openstack.ssh_private_key
-#   sudoer_username  = module.openstack.accounts.sudoer.username
 # }
 
 # output "hostnames" {

diff --git a/examples/advanced/spot_instances/aws/main.tf b/examples/advanced/spot_instances/aws/main.tf
@@ -53,10 +53,7 @@ output "public_ip" {
 #   source           = "git::https://github.com/ComputeCanada/magic_castle.git//dns/cloudflare"
 #   name             = module.aws.cluster_name
 #   domain           = module.aws.domain
-#   bastions         = module.aws.bastions
 #   public_instances = module.aws.public_instances
-#   ssh_private_key  = module.aws.ssh_private_key
-#   sudoer_username  = module.aws.accounts.sudoer.username
 # }
 
 ## Uncomment to register your domain name with Google Cloud
@@ -66,10 +63,7 @@ output "public_ip" {
 #   zone_name        = "you-zone-name"
 #   name             = module.aws.cluster_name
 #   domain           = module.aws.domain
-#   bastions         = module.aws.bastions
 #   public_instances = module.aws.public_instances
-#   ssh_private_key  = module.aws.ssh_private_key
-#   sudoer_username  = module.aws.accounts.sudoer.username
 # }
 
 # output "hostnames" {

diff --git a/examples/advanced/spot_instances/azure/main.tf b/examples/advanced/spot_instances/azure/main.tf
@@ -57,10 +57,7 @@ output "public_ip" {
 #   source           = "git::https://github.com/ComputeCanada/magic_castle.git//dns/cloudflare"
 #   name             = module.azure.cluster_name
 #   domain           = module.azure.domain
-#   bastions         = module.azure.bastions
 #   public_instances = module.azure.public_instances
-#   ssh_private_key  = module.azure.ssh_private_key
-#   sudoer_username  = module.azure.accounts.sudoer.username
 # }
 
 ## Uncomment to register your domain name with Google Cloud
@@ -70,10 +67,7 @@ output "public_ip" {
 #   zone_name        = "you-zone-name"
 #   name             = module.azure.cluster_name
 #   domain           = module.azure.domain
-#   bastions         = module.azure.bastions
 #   public_instances = module.azure.public_instances
-#   ssh_private_key  = module.azure.ssh_private_key
-#   sudoer_username  = module.azure.accounts.sudoer.username
 # }
 
 # output "hostnames" {