diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/main.tf b/examples/full-cluster-tf-upgrade/1.25/common-services/main.tf index ebc690a..27374d7 100644 --- a/examples/full-cluster-tf-upgrade/1.25/common-services/main.tf +++ b/examples/full-cluster-tf-upgrade/1.25/common-services/main.tf @@ -1,26 +1,27 @@ locals { - charts = { - "cert-manager" = { - name = "cert-manager" - repository = "https://charts.jetstack.io" - version = "v1.4.3" - use_remote = true - } - - "metrics-server" = { - name = "metrics-server" - repository = "https://charts.bitnami.com/bitnami" - version = "6.2.6" - use_remote = true - } - - # a standard chart that is downloaded as part of the istio-bundle. It's not - # available standalone in a repository - # name = "istio-operator" - # these are all custom - # name = "certificate-issuer" - # name = "istio-profile" - } + charts = var.chart_details + ## charts = { + ## "cert-manager" = { + ## name = "cert-manager" + ## repository = "https://charts.jetstack.io" + ## version = "v1.4.3" + ## use_remote = true + ## } + ## + ## "metrics-server" = { + ## name = "metrics-server" + ## repository = "https://charts.bitnami.com/bitnami" + ## version = "6.2.6" + ## use_remote = true + ## } + ## + ## # a standard chart that is downloaded as part of the istio-bundle. It's not + ## # available standalone in a repository + ## # name = "istio-operator" + ## # these are all custom + ## # name = "certificate-issuer" + ## # name = "istio-profile" + ## } } resource "kubernetes_namespace" "cert-manager" { diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.auto.tfvars b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.auto.tfvars index 8f4ca2e..ca0b02a 100644 --- a/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.auto.tfvars +++ b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.auto.tfvars @@ -23,3 +23,19 @@ vault_serviceaccount_role = "" vault_serviceaccount_sa = "" vault_token = "" vault_url = "" + +chart_details = { + "cert-manager" = { + name = "cert-manager" + repository = "https://charts.jetstack.io" + version = "v1.12.2" + use_remote = true + } + + "metrics-server" = { + name = "metrics-server" + repository = "https://charts.bitnami.com/bitnami" + version = "6.2.6" + use_remote = true + } +} diff --git a/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.tf b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.tf index 17f2009..8567284 100644 --- a/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.tf +++ b/examples/full-cluster-tf-upgrade/1.25/common-services/variables.common-services.tf @@ -207,3 +207,14 @@ variable "istio_tag" { default = "1.10.1" } +variable "chart_details" { + description = "Map of object with details about remote charts" + type = map(object( + { + name = string + repository = string + version = string + use_remote = bool + })) + default = {} +}