Skip to content

Commit

Permalink
Merge pull request #1555 from janfrederik/fix/cert-manager-values
Browse files Browse the repository at this point in the history
Replace deprecated cert-manager value "installCRDs" by "crds.enabled" and "crds.keep"
  • Loading branch information
aleksasiriski authored Nov 20, 2024
2 parents dd9be25 + ccc8f98 commit 006e5ea
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
5 changes: 4 additions & 1 deletion kube.tf.example
Original file line number Diff line number Diff line change
Expand Up @@ -939,8 +939,11 @@ MTU: 1450

# Cert manager, all cert-manager helm values can be found at https://github.com/cert-manager/cert-manager/blob/master/deploy/charts/cert-manager/values.yaml
# The following is an example, please note that the current indentation inside the EOT is important.
# For cert-manager versions < v1.15.0, you need to set installCRDs: true instead of crds.enabled and crds.keep.
/* cert_manager_values = <<EOT
installCRDs: true
crds:
enabled: true
keep: true
replicaCount: 3
webhook:
replicaCount: 3
Expand Down
4 changes: 3 additions & 1 deletion locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -750,7 +750,9 @@ global:
EOT

cert_manager_values = var.cert_manager_values != "" ? var.cert_manager_values : <<EOT
installCRDs: true
crds:
enabled: true
keep: true
EOT

kured_options = merge({
Expand Down
8 changes: 6 additions & 2 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -823,8 +823,12 @@ variable "cert_manager_helmchart_bootstrap" {

variable "cert_manager_values" {
type = string
default = ""
description = "Additional helm values file to pass to Cert-Manager as 'valuesContent' at the HelmChart."
default = <<EOT
crds:
enabled: true
keep: true
EOT
description = "Additional helm values file to pass to Cert-Manager as 'valuesContent' at the HelmChart. Warning, the default value is only valid from cert-manager v1.15.0 onwards. For older versions, you need to set 'installCRDs: true'."
}

variable "enable_rancher" {
Expand Down

0 comments on commit 006e5ea

Please sign in to comment.