Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat!: remove the cluster_id variable || fix: remove the working_directory attribute in the compactor config #119

Merged
merged 4 commits into from
Aug 14, 2024
Merged

feat!: remove the cluster_id variable || fix: remove the working_directory attribute in the compactor config #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4c646f
feat!: remove the cluster_id variable
lentidas Jul 16, 2024
f0a917a
docs(terraform-docs): generate docs and write to README.adoc
lentidas Jul 16, 2024
acd71ba
fix: remove the working_directory attribute in the compactor config
lentidas Aug 7, 2024
6729b0e
docs(terraform-docs): generate docs and write to README.adoc
lentidas Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ The following requirements are needed by this module:

The following providers are used by this module:

- [[provider_null]] <<provider_null,null>> (>= 3)

- [[provider_random]] <<provider_random,random>> (>= 3)

- [[provider_htpasswd]] <<provider_htpasswd,htpasswd>> (>= 1)

- [[provider_argocd]] <<provider_argocd,argocd>> (>= 5)

- [[provider_utils]] <<provider_utils,utils>> (>= 1)

- [[provider_argocd]] <<provider_argocd,argocd>> (>= 5)
- [[provider_null]] <<provider_null,null>> (>= 3)

=== Resources

Expand Down Expand Up @@ -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]] <<input_helm_values,helm_values>>

Expand Down Expand Up @@ -380,7 +380,7 @@ Description: Credentials to access the Loki ingress, if activated.
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v8.0.0"`
|`"v8.2.0"`
|no

|[[input_helm_values]] <<input_helm_values,helm_values>>
Expand Down
4 changes: 2 additions & 2 deletions aks/README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]] <<input_helm_values,helm_values>>

Expand Down Expand Up @@ -420,7 +420,7 @@ object({
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v8.0.0"`
|`"v8.2.0"`
|no

|[[input_helm_values]] <<input_helm_values,helm_values>>
Expand Down
3 changes: 1 addition & 2 deletions aks/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ locals {
}
structuredConfig = {
compactor = {
shared_store = "azure"
working_directory = "/var/loki"
shared_store = "azure"
}
}
})
Expand Down
4 changes: 2 additions & 2 deletions eks/README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]] <<input_helm_values,helm_values>>

Expand Down Expand Up @@ -421,7 +421,7 @@ object({
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v8.0.0"`
|`"v8.2.0"`
|no

|[[input_helm_values]] <<input_helm_values,helm_values>>
Expand Down
3 changes: 1 addition & 2 deletions eks/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ locals {
}
structuredConfig = {
compactor = {
working_directory = "/data/compactor"
shared_store = "s3"
shared_store = "s3"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions kind/README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]] <<input_helm_values,helm_values>>

Expand Down Expand Up @@ -379,7 +379,7 @@ object({
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v8.0.0"`
|`"v8.2.0"`
|no

|[[input_helm_values]] <<input_helm_values,helm_values>>
Expand Down
3 changes: 1 addition & 2 deletions kind/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ locals {
}
structuredConfig = {
compactor = {
working_directory = "/data/compactor"
shared_store = "aws"
shared_store = "aws"
}
}
}
Expand Down
16 changes: 2 additions & 14 deletions sks/README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,6 @@ Version:

The following input variables are required:

==== [[input_cluster_id]] <<input_cluster_id,cluster_id>>

Description: ID of the SKS cluster.

Type: `string`

==== [[input_logs_storage]] <<input_logs_storage,logs_storage>>

Description: Exoscale SOS bucket configuration values for the bucket where the logs will be stored.
Expand Down Expand Up @@ -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]] <<input_helm_values,helm_values>>

Expand Down Expand Up @@ -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]] <<input_cluster_id,cluster_id>>
|ID of the SKS cluster.
|`string`
|n/a
|yes

|[[input_logs_storage]] <<input_logs_storage,logs_storage>>
|Exoscale SOS bucket configuration values for the bucket where the logs will be stored.
|
Expand Down Expand Up @@ -487,7 +475,7 @@ object({
|[[input_target_revision]] <<input_target_revision,target_revision>>
|Override of target revision of the application chart.
|`string`
|`"v8.0.0"`
|`"v8.2.0"`
|no

|[[input_helm_values]] <<input_helm_values,helm_values>>
Expand Down
5 changes: 0 additions & 5 deletions sks/extra-variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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({
Expand Down
6 changes: 1 addition & 5 deletions sks/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
locals {
helm_values = [{
loki-distributed = {
global = {
clusterDomain = "${var.cluster_id}.cluster.local"
}
loki = {
schemaConfig = {
configs = [{
Expand Down Expand Up @@ -32,8 +29,7 @@ locals {
}
structuredConfig = {
compactor = {
working_directory = "/data/compactor"
shared_store = "s3"
shared_store = "s3"
}
}
}
Expand Down