diff --git a/README.adoc b/README.adoc index 9e1d3647..462d7c25 100644 --- a/README.adoc +++ b/README.adoc @@ -114,7 +114,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v1.0.0-alpha.4"` +Default: `"v1.0.0-alpha.5"` ==== [[input_thanos]] <> @@ -215,7 +215,7 @@ Description: ID to pass other modules in order to refer to this module as a depe |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v1.0.0-alpha.4"` +|`"v1.0.0-alpha.5"` |no |[[input_thanos]] <> diff --git a/aks/README.adoc b/aks/README.adoc index 70cdbf8e..b6896aa7 100644 --- a/aks/README.adoc +++ b/aks/README.adoc @@ -11,15 +11,15 @@ This module can be declared by adding the following block on your Terraform conf module "thanos" { source = "git::https://github.com/camptocamp/devops-stack-module-thanos.git//aks?ref=" - cluster_name = var.cluster_name - argocd_namespace = module.cluster.argocd_namespace - base_domain = module.cluster.base_domain - cluster_issuer = var.cluster_issuer + cluster_name = var.cluster_name + argocd_namespace = module.cluster.argocd_namespace + base_domain = module.cluster.base_domain + cluster_issuer = var.cluster_issuer metrics_storage = { - container_name = azurerm_storage_container.thanos.name - storage_account_name = azurerm_storage_account.thanos.name - storage_account_key = azurerm_storage_account.thanos.primary_access_key + container = azurerm_storage_container.thanos.name + storage_account = azurerm_storage_account.thanos.name + storage_account_key = azurerm_storage_account.thanos.primary_access_key } thanos = { @@ -39,15 +39,15 @@ Although the declaration above allows you to have a barebones Thanos deployed, i module "thanos" { source = "git::https://github.com/camptocamp/devops-stack-module-thanos.git//aks?ref=" - cluster_name = var.cluster_name - argocd_namespace = module.cluster.argocd_namespace - base_domain = module.cluster.base_domain - cluster_issuer = var.cluster_issuer + cluster_name = var.cluster_name + argocd_namespace = module.cluster.argocd_namespace + base_domain = module.cluster.base_domain + cluster_issuer = var.cluster_issuer metrics_storage = { - container_name = azurerm_storage_container.thanos.name - storage_account_name = azurerm_storage_account.thanos.name - storage_account_key = azurerm_storage_account.thanos.primary_access_key + container = azurerm_storage_container.thanos.name + storage_account = azurerm_storage_account.thanos.name + storage_account_key = azurerm_storage_account.thanos.primary_access_key } thanos = { @@ -107,15 +107,15 @@ If there is a need to configure something besides the common settings that we ha module "thanos" { source = "git::https://github.com/camptocamp/devops-stack-module-thanos.git//aks?ref=" - cluster_name = var.cluster_name - argocd_namespace = module.cluster.argocd_namespace - base_domain = module.cluster.base_domain - cluster_issuer = var.cluster_issuer + cluster_name = var.cluster_name + argocd_namespace = module.cluster.argocd_namespace + base_domain = module.cluster.base_domain + cluster_issuer = var.cluster_issuer metrics_storage = { - container_name = azurerm_storage_container.thanos.name - storage_account_name = azurerm_storage_account.thanos.name - storage_account_key = azurerm_storage_account.thanos.primary_access_key + container = azurerm_storage_container.thanos.name + storage_account = azurerm_storage_account.thanos.name + storage_account_key = azurerm_storage_account.thanos.primary_access_key } thanos = { @@ -258,9 +258,9 @@ Type: [source,hcl] ---- object({ - container_name = string - storage_account_name = string - storage_account_key = string + container = string + storage_account = string + storage_account_key = string }) ---- @@ -306,7 +306,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v1.0.0-alpha.4"` +Default: `"v1.0.0-alpha.5"` ==== [[input_thanos]] <> @@ -389,9 +389,9 @@ Description: ID to pass other modules in order to refer to this module as a depe [source] ---- object({ - container_name = string - storage_account_name = string - storage_account_key = string + container = string + storage_account = string + storage_account_key = string }) ---- @@ -407,7 +407,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v1.0.0-alpha.4"` +|`"v1.0.0-alpha.5"` |no |[[input_thanos]] <> diff --git a/aks/extra-variables.tf b/aks/extra-variables.tf index f68655e7..344b03e5 100644 --- a/aks/extra-variables.tf +++ b/aks/extra-variables.tf @@ -1,8 +1,8 @@ variable "metrics_storage" { description = "Azure Blob Storage configuration values for the storage container where the archived metrics will be stored." type = object({ - container_name = string - storage_account_name = string - storage_account_key = string + container = string + storage_account = string + storage_account_key = string }) } diff --git a/aks/locals.tf b/aks/locals.tf index 94639ea2..541e9125 100644 --- a/aks/locals.tf +++ b/aks/locals.tf @@ -4,8 +4,8 @@ locals { objstoreConfig = { type = "AZURE" config = { - container = "${var.metrics_storage.container_name}" - storage_account = "${var.metrics_storage.storage_account_name}" + container = "${var.metrics_storage.container}" + storage_account = "${var.metrics_storage.storage_account}" storage_account_key = "${var.metrics_storage.storage_account_key}" } } diff --git a/eks/README.adoc b/eks/README.adoc index 0d06ac62..7269cc52 100644 --- a/eks/README.adoc +++ b/eks/README.adoc @@ -358,7 +358,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v1.0.0-alpha.4"` +Default: `"v1.0.0-alpha.5"` ==== [[input_thanos]] <> @@ -459,7 +459,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v1.0.0-alpha.4"` +|`"v1.0.0-alpha.5"` |no |[[input_thanos]] <> diff --git a/kind/README.adoc b/kind/README.adoc index 86c6cc9a..19877800 100644 --- a/kind/README.adoc +++ b/kind/README.adoc @@ -256,7 +256,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v1.0.0-alpha.4"` +Default: `"v1.0.0-alpha.5"` ==== [[input_thanos]] <> @@ -358,7 +358,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v1.0.0-alpha.4"` +|`"v1.0.0-alpha.5"` |no |[[input_thanos]] <>