From 558f1af7bdabb19328c0f8ddfe6c8ffe7c6eb911 Mon Sep 17 00:00:00 2001 From: neila42 Date: Thu, 19 Dec 2024 11:04:04 +0100 Subject: [PATCH 1/2] feat(alertmanager): add PVC for silences persistance --- locals.tf | 12 ++++++++++++ variables.tf | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/locals.tf b/locals.tf index b220d1c..fb7a2a5 100644 --- a/locals.tf +++ b/locals.tf @@ -169,6 +169,18 @@ locals { requests = { for k, v in var.resources.alertmanager.requests : k => v if v != null } limits = { for k, v in var.resources.alertmanager.limits : k => v if v != null } } + storage = { + volumeClaimTemplate = { + spec = { + accessModes = ["ReadWriteOnce"] + resources = { + requests = { + storage = var.alertmanager_storage_size + } + } + } + } + } } ingress = { enabled = true diff --git a/variables.tf b/variables.tf index 8eb80fc..2c8ca4a 100644 --- a/variables.tf +++ b/variables.tf @@ -215,3 +215,9 @@ variable "dataproxy_timeout" { type = number default = 30 } + +variable "alertmanager_storage_size" { + description = "PVC size for Alertmanager data." + type = string + default = "10Gi" +} From 70f1fda3fa2ea27607977d84f555d4dfe77cf39d Mon Sep 17 00:00:00 2001 From: neilamumi Date: Thu, 19 Dec 2024 13:34:56 +0000 Subject: [PATCH 2/2] docs(terraform-docs): generate docs and write to README.adoc --- README.adoc | 26 ++++++++++++++++++++------ aks/README.adoc | 18 ++++++++++++++++-- eks/README.adoc | 18 ++++++++++++++++-- kind/README.adoc | 18 ++++++++++++++++-- sks/README.adoc | 18 ++++++++++++++++-- 5 files changed, 84 insertions(+), 14 deletions(-) diff --git a/README.adoc b/README.adoc index fbf0eb4..039aec0 100644 --- a/README.adoc +++ b/README.adoc @@ -38,14 +38,14 @@ The following requirements are needed by this module: The following providers are used by this module: -- [[provider_kubernetes]] <> (>= 2) - - [[provider_random]] <> (>= 3) -- [[provider_utils]] <> (>= 1) - - [[provider_argocd]] <> (>= 6) +- [[provider_kubernetes]] <> (>= 2) + +- [[provider_utils]] <> (>= 1) + - [[provider_null]] <> (>= 3) === Resources @@ -120,7 +120,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v13.0.0"` +Default: `"v13.0.1"` ==== [[input_cluster_issuer]] <> @@ -322,6 +322,14 @@ Type: `number` Default: `30` +==== [[input_alertmanager_storage_size]] <> + +Description: PVC size for Alertmanager data. + +Type: `string` + +Default: `"10Gi"` + === Outputs The following outputs are exported: @@ -425,7 +433,7 @@ Description: The admin password for Grafana. |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v13.0.0"` +|`"v13.0.1"` |no |[[input_cluster_issuer]] <> @@ -614,6 +622,12 @@ object({ |`30` |no +|[[input_alertmanager_storage_size]] <> +|PVC size for Alertmanager data. +|`string` +|`"10Gi"` +|no + |=== = Outputs diff --git a/aks/README.adoc b/aks/README.adoc index d84c888..a13a324 100644 --- a/aks/README.adoc +++ b/aks/README.adoc @@ -118,7 +118,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v13.0.0"` +Default: `"v13.0.1"` ==== [[input_cluster_issuer]] <> @@ -320,6 +320,14 @@ Type: `number` Default: `30` +==== [[input_alertmanager_storage_size]] <> + +Description: PVC size for Alertmanager data. + +Type: `string` + +Default: `"10Gi"` + === Outputs The following outputs are exported: @@ -437,7 +445,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v13.0.0"` +|`"v13.0.1"` |no |[[input_cluster_issuer]] <> @@ -626,6 +634,12 @@ object({ |`30` |no +|[[input_alertmanager_storage_size]] <> +|PVC size for Alertmanager data. +|`string` +|`"10Gi"` +|no + |=== = Outputs diff --git a/eks/README.adoc b/eks/README.adoc index c05a27b..7f4aa3a 100644 --- a/eks/README.adoc +++ b/eks/README.adoc @@ -118,7 +118,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v13.0.0"` +Default: `"v13.0.1"` ==== [[input_cluster_issuer]] <> @@ -320,6 +320,14 @@ Type: `number` Default: `30` +==== [[input_alertmanager_storage_size]] <> + +Description: PVC size for Alertmanager data. + +Type: `string` + +Default: `"10Gi"` + === Outputs The following outputs are exported: @@ -433,7 +441,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v13.0.0"` +|`"v13.0.1"` |no |[[input_cluster_issuer]] <> @@ -622,6 +630,12 @@ object({ |`30` |no +|[[input_alertmanager_storage_size]] <> +|PVC size for Alertmanager data. +|`string` +|`"10Gi"` +|no + |=== = Outputs diff --git a/kind/README.adoc b/kind/README.adoc index d67eaa1..5d1a32f 100644 --- a/kind/README.adoc +++ b/kind/README.adoc @@ -99,7 +99,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v13.0.0"` +Default: `"v13.0.1"` ==== [[input_cluster_issuer]] <> @@ -301,6 +301,14 @@ Type: `number` Default: `30` +==== [[input_alertmanager_storage_size]] <> + +Description: PVC size for Alertmanager data. + +Type: `string` + +Default: `"10Gi"` + === Outputs The following outputs are exported: @@ -396,7 +404,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v13.0.0"` +|`"v13.0.1"` |no |[[input_cluster_issuer]] <> @@ -585,6 +593,12 @@ object({ |`30` |no +|[[input_alertmanager_storage_size]] <> +|PVC size for Alertmanager data. +|`string` +|`"10Gi"` +|no + |=== = Outputs diff --git a/sks/README.adoc b/sks/README.adoc index 1cb6ddc..2ae0963 100644 --- a/sks/README.adoc +++ b/sks/README.adoc @@ -240,7 +240,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v13.0.0"` +Default: `"v13.0.1"` ==== [[input_cluster_issuer]] <> @@ -442,6 +442,14 @@ Type: `number` Default: `30` +==== [[input_alertmanager_storage_size]] <> + +Description: PVC size for Alertmanager data. + +Type: `string` + +Default: `"10Gi"` + === Outputs The following outputs are exported: @@ -542,7 +550,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v13.0.0"` +|`"v13.0.1"` |no |[[input_cluster_issuer]] <> @@ -731,6 +739,12 @@ object({ |`30` |no +|[[input_alertmanager_storage_size]] <> +|PVC size for Alertmanager data. +|`string` +|`"10Gi"` +|no + |=== = Outputs