diff --git a/README.adoc b/README.adoc index 9e225d8..c95707a 100644 --- a/README.adoc +++ b/README.adoc @@ -22,15 +22,15 @@ The following requirements are needed by this module: The following providers are used by this module: -- [[provider_null]] <> (>= 3) - - [[provider_random]] <> (>= 3) - [[provider_htpasswd]] <> (>= 1) +- [[provider_argocd]] <> (>= 5) + - [[provider_utils]] <> (>= 1) -- [[provider_argocd]] <> (>= 5) +- [[provider_null]] <> (>= 3) === Resources @@ -78,7 +78,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v8.0.0"` +Default: `"v8.2.0"` ==== [[input_helm_values]] <> @@ -380,7 +380,7 @@ Description: Credentials to access the Loki ingress, if activated. |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v8.0.0"` +|`"v8.2.0"` |no |[[input_helm_values]] <> diff --git a/aks/README.adoc b/aks/README.adoc index 1e96a9c..9eacf78 100644 --- a/aks/README.adoc +++ b/aks/README.adoc @@ -96,7 +96,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v8.0.0"` +Default: `"v8.2.0"` ==== [[input_helm_values]] <> @@ -420,7 +420,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v8.0.0"` +|`"v8.2.0"` |no |[[input_helm_values]] <> diff --git a/aks/locals.tf b/aks/locals.tf index a299d91..b222d4e 100644 --- a/aks/locals.tf +++ b/aks/locals.tf @@ -50,8 +50,7 @@ locals { } structuredConfig = { compactor = { - shared_store = "azure" - working_directory = "/var/loki" + shared_store = "azure" } } }) diff --git a/eks/README.adoc b/eks/README.adoc index f15f031..919ca32 100644 --- a/eks/README.adoc +++ b/eks/README.adoc @@ -98,7 +98,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v8.0.0"` +Default: `"v8.2.0"` ==== [[input_helm_values]] <> @@ -421,7 +421,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v8.0.0"` +|`"v8.2.0"` |no |[[input_helm_values]] <> diff --git a/eks/locals.tf b/eks/locals.tf index 604787e..4a322a6 100644 --- a/eks/locals.tf +++ b/eks/locals.tf @@ -26,8 +26,7 @@ locals { } structuredConfig = { compactor = { - working_directory = "/data/compactor" - shared_store = "s3" + shared_store = "s3" } } } diff --git a/kind/README.adoc b/kind/README.adoc index ab70661..80df5db 100644 --- a/kind/README.adoc +++ b/kind/README.adoc @@ -77,7 +77,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v8.0.0"` +Default: `"v8.2.0"` ==== [[input_helm_values]] <> @@ -379,7 +379,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v8.0.0"` +|`"v8.2.0"` |no |[[input_helm_values]] <> diff --git a/kind/locals.tf b/kind/locals.tf index 3ce1d8c..7efac53 100644 --- a/kind/locals.tf +++ b/kind/locals.tf @@ -30,8 +30,7 @@ locals { } structuredConfig = { compactor = { - working_directory = "/data/compactor" - shared_store = "aws" + shared_store = "aws" } } } diff --git a/sks/README.adoc b/sks/README.adoc index 9f00694..c4e6fcf 100644 --- a/sks/README.adoc +++ b/sks/README.adoc @@ -119,12 +119,6 @@ Version: The following input variables are required: -==== [[input_cluster_id]] <> - -Description: ID of the SKS cluster. - -Type: `string` - ==== [[input_logs_storage]] <> Description: Exoscale SOS bucket configuration values for the bucket where the logs will be stored. @@ -174,7 +168,7 @@ Description: Override of target revision of the application chart. Type: `string` -Default: `"v8.0.0"` +Default: `"v8.2.0"` ==== [[input_helm_values]] <> @@ -443,12 +437,6 @@ Description: Credentials to access the Loki ingress, if activated. [cols="a,a,a,a,a",options="header,autowidth"] |=== |Name |Description |Type |Default |Required -|[[input_cluster_id]] <> -|ID of the SKS cluster. -|`string` -|n/a -|yes - |[[input_logs_storage]] <> |Exoscale SOS bucket configuration values for the bucket where the logs will be stored. | @@ -487,7 +475,7 @@ object({ |[[input_target_revision]] <> |Override of target revision of the application chart. |`string` -|`"v8.0.0"` +|`"v8.2.0"` |no |[[input_helm_values]] <> diff --git a/sks/extra-variables.tf b/sks/extra-variables.tf index d6b2dcd..2b2ddf4 100644 --- a/sks/extra-variables.tf +++ b/sks/extra-variables.tf @@ -1,8 +1,3 @@ -variable "cluster_id" { - description = "ID of the SKS cluster." - type = string -} - variable "logs_storage" { description = "Exoscale SOS bucket configuration values for the bucket where the logs will be stored." type = object({ diff --git a/sks/locals.tf b/sks/locals.tf index fddb0cd..e46ffe9 100644 --- a/sks/locals.tf +++ b/sks/locals.tf @@ -1,9 +1,6 @@ locals { helm_values = [{ loki-distributed = { - global = { - clusterDomain = "${var.cluster_id}.cluster.local" - } loki = { schemaConfig = { configs = [{ @@ -32,8 +29,7 @@ locals { } structuredConfig = { compactor = { - working_directory = "/data/compactor" - shared_store = "s3" + shared_store = "s3" } } }