Skip to content

Commit

Permalink
fix: change values names to the same as in kube-prometheus-stack modu…
Browse files Browse the repository at this point in the history 
…le (#23)

* fix: change values names to the same as in kube-prometheus-stack module

* docs: update docs with new values

* docs(terraform-docs): generate docs and write to README.adoc

Co-authored-by: lentidas <[email protected]>
Release-As: v1.0.0-alpha.6
  • Loading branch information
@lentidas
lentidas and lentidas authored Dec 16, 2022
1 parent 68990dd commit 5e57dea
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 40 deletions.
4 changes: 2 additions & 2 deletions README.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]] <<input_thanos,thanos>>

Expand Down Expand Up @@ -215,7 +215,7 @@ Description: ID to pass other modules in order to refer to this module as a depe
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v1.0.0-alpha.4"`
|`"v1.0.0-alpha.5"`
|no
|[[input_thanos]] <<input_thanos,thanos>>
Expand Down
58 changes: 29 additions & 29 deletions aks/README.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=<RELEASE>"
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 = {
Expand All @@ -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=<RELEASE>"
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 = {
Expand Down Expand Up @@ -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=<RELEASE>"
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 = {
Expand Down Expand Up @@ -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
})
----

Expand Down Expand Up @@ -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]] <<input_thanos,thanos>>

Expand Down Expand Up @@ -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
})
----
Expand All @@ -407,7 +407,7 @@ object({
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v1.0.0-alpha.4"`
|`"v1.0.0-alpha.5"`
|no
|[[input_thanos]] <<input_thanos,thanos>>
Expand Down
6 changes: 3 additions & 3 deletions aks/extra-variables.tf
View file
Original file line number Diff line number Diff line change
@@ -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
})
}
4 changes: 2 additions & 2 deletions aks/locals.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}
}
Expand Down
4 changes: 2 additions & 2 deletions eks/README.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]] <<input_thanos,thanos>>

Expand Down Expand Up @@ -459,7 +459,7 @@ object({
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v1.0.0-alpha.4"`
|`"v1.0.0-alpha.5"`
|no
|[[input_thanos]] <<input_thanos,thanos>>
Expand Down
4 changes: 2 additions & 2 deletions kind/README.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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]] <<input_thanos,thanos>>

Expand Down Expand Up @@ -358,7 +358,7 @@ object({
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v1.0.0-alpha.4"`
|`"v1.0.0-alpha.5"`
|no
|[[input_thanos]] <<input_thanos,thanos>>
Expand Down

0 comments on commit 5e57dea

Please sign in to comment.