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.

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

feat(chart)!: major update of dependencies on thanos chart #75

Merged
merged 4 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
= devops-stack-module-thanos
// Document attributes to replace along the document
:thanos-chart-version: 12.21.0
:thanos-chart-version: 13.2.2
:original-repo-url: https://github.com/bitnami/charts/tree/master/bitnami/thanos

A https://devops-stack.io[DevOps Stack] module to deploy and configure https://thanos.io[Thanos].
Expand Down Expand Up @@ -36,14 +36,14 @@ 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_utils]] <<provider_utils,utils>> (>= 1)

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

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

=== Resources

The following resources are used by this module:
Expand Down Expand Up @@ -219,10 +219,10 @@ Description: ID to pass other modules in order to refer to this module as a depe
[cols="a,a",options="header,autowidth"]
|===
|Name |Version
|[[provider_null]] <<provider_null,null>> |>= 3
|[[provider_random]] <<provider_random,random>> |>= 3
|[[provider_utils]] <<provider_utils,utils>> |>= 1
|[[provider_argocd]] <<provider_argocd,argocd>> |>= 5
|[[provider_null]] <<provider_null,null>> |>= 3
|===

= Resources
Expand Down
8 changes: 4 additions & 4 deletions charts/thanos/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
dependencies:
- name: thanos
repository: https://charts.bitnami.com/bitnami
version: 12.21.0
version: 13.2.2
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 18.4.0
digest: sha256:9e68e1a336132ec1152bb7a4d6d1b556ab13fc5cd54cd5d69ddeaa3f5bbdba30
generated: "2024-02-06T11:45:00.264361878+01:00"
version: 18.17.0
digest: sha256:cc752483b9a6cb90320dc5faa387af7fb40a5e3e7dd19cad7198043d5afc97b9
generated: "2024-03-01T12:28:15.172575594Z"
8 changes: 4 additions & 4 deletions charts/thanos/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ apiVersion: v2
dependencies:
- name: thanos
repository: https://charts.bitnami.com/bitnami
version: 12.21.0
- name: "redis"
version: "18.4.0"
repository: "https://charts.bitnami.com/bitnami"
version: 13.2.2
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 18.17.0
name: thanos
version: "0"
Binary file added charts/thanos/charts/redis-18.17.0.tgz
Binary file not shown.
Binary file removed charts/thanos/charts/redis-18.4.0.tgz
Binary file not shown.
Binary file removed charts/thanos/charts/thanos-12.21.0.tgz
Binary file not shown.
Binary file added charts/thanos/charts/thanos-13.2.2.tgz
Binary file not shown.
29 changes: 27 additions & 2 deletions locals.tf
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,16 @@ locals {
enabled = var.enable_service_monitor
}
}

storegateway = {
enabled = true
persistence = {
enabled = false
}
resources = local.thanos.storegateway_resources
networkPolicy = {
enabled = false
}
extraFlags = [
# Store Gateway index cache config -> https://thanos.io/tip/components/store.md/#index-cache
<<-EOT
Expand Down Expand Up @@ -69,6 +73,9 @@ locals {
"thanos-storegateway:10901"
]
resources = local.thanos.query_resources
networkPolicy = {
enabled = false
}
}

compactor = {
Expand All @@ -87,6 +94,9 @@ locals {
]
size = local.thanos.compactor_persistence_size
}
networkPolicy = {
enabled = false
}
}

bucketweb = {
Expand Down Expand Up @@ -172,6 +182,9 @@ locals {
]
}]
}
networkPolicy = {
enabled = false
}
}

queryFrontend = {
Expand Down Expand Up @@ -221,7 +234,7 @@ locals {
sidecars = [{
args = concat([
"--http-address=0.0.0.0:9075",
"--upstream=http://localhost:10902",
"--upstream=http://localhost:9090",
"--provider=oidc",
"--oidc-issuer-url=${replace(local.thanos.oidc.issuer_url, "\"", "\\\"")}",
"--client-id=${replace(local.thanos.oidc.client_id, "\"", "\\\"")}",
Expand Down Expand Up @@ -299,8 +312,20 @@ locals {
]
}]
}
networkPolicy = {
enabled = false
}
}
receive = {
networkPolicy = {
enabled = false
}
}
ruler = {
networkPolicy = {
enabled = false
}
}

}
}]

Expand Down