Skip to content

Commit

Permalink
fix: remove the need to set the Let's Encrypt e-mail when self-signed
Browse files Browse the repository at this point in the history
  • Loading branch information
lentidas committed Nov 10, 2023
1 parent c95ed91 commit 1a6a4dc
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 10 deletions.
5 changes: 5 additions & 0 deletions aks/extra_variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,8 @@ variable "cluster_oidc_issuer_url" {
description = "The OIDC issuer URL that is associated with the cluster."
type = string
}

variable "letsencrypt_issuer_email" {
description = "E-mail address used to register with Let's Encrypt."
type = string
}
2 changes: 1 addition & 1 deletion aks/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ module "cert-manager" {

helm_values = concat(local.helm_values, var.helm_values)

letsencrypt_issuer_email = var.letsencrypt_issuer_email
letsencrypt_issuer_email_main = var.letsencrypt_issuer_email

dependency_ids = var.dependency_ids
}
5 changes: 5 additions & 0 deletions eks/extra_variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,8 @@ variable "other_domains" {
type = list(string)
default = []
}

variable "letsencrypt_issuer_email" {
description = "E-mail address used to register with Let's Encrypt."
type = string
}
2 changes: 1 addition & 1 deletion eks/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ module "cert-manager" {

helm_values = concat(local.helm_values, var.helm_values)

letsencrypt_issuer_email = var.letsencrypt_issuer_email
letsencrypt_issuer_email_main = var.letsencrypt_issuer_email

dependency_ids = var.dependency_ids
}
4 changes: 2 additions & 2 deletions locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ locals {
letsencrypt = {
production = {
name = "letsencrypt-prod"
email = var.letsencrypt_issuer_email
email = var.letsencrypt_issuer_email_main
server = "https://acme-v02.api.letsencrypt.org/directory"
}
staging = {
name = "letsencrypt-staging"
email = var.letsencrypt_issuer_email
email = var.letsencrypt_issuer_email_main
server = "https://acme-staging-v02.api.letsencrypt.org/directory"
}
}
Expand Down
5 changes: 4 additions & 1 deletion scaleway/extra_variables.tf
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@

variable "letsencrypt_issuer_email" {
description = "E-mail address used to register with Let's Encrypt."
type = string
}
2 changes: 1 addition & 1 deletion scaleway/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module "cert-manager" {

helm_values = concat(local.helm_values, var.helm_values)

letsencrypt_issuer_email = var.letsencrypt_issuer_email
letsencrypt_issuer_email_main = var.letsencrypt_issuer_email

dependency_ids = var.dependency_ids
}
2 changes: 1 addition & 1 deletion self-signed/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ module "cert-manager" {

helm_values = concat(local.helm_values, var.helm_values)

letsencrypt_issuer_email = var.letsencrypt_issuer_email
letsencrypt_issuer_email_main = null

dependency_ids = var.dependency_ids
}
4 changes: 4 additions & 0 deletions sks/extra_variables.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
variable "letsencrypt_issuer_email" {
description = "E-mail address used to register with Let's Encrypt."
type = string
}
2 changes: 1 addition & 1 deletion sks/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module "cert-manager" {

helm_values = concat(local.helm_values, var.helm_values)

letsencrypt_issuer_email = var.letsencrypt_issuer_email
letsencrypt_issuer_email_main = var.letsencrypt_issuer_email

dependency_ids = var.dependency_ids
}
4 changes: 2 additions & 2 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ variable "dependency_ids" {
## Module variables
#######################

variable "letsencrypt_issuer_email" {
description = "Email address used to register with Let's Encrypt."
variable "letsencrypt_issuer_email_main" {
description = "E-mail address used to register with Let's Encrypt."
type = string
}

Expand Down

0 comments on commit 1a6a4dc

Please sign in to comment.