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

fix(thanos): use oci repo #3136

Merged
merged 2 commits into from
Dec 18, 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
2 changes: 1 addition & 1 deletion modules/aws/kube-prometheus.tf
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ locals {
thanos_bucket = "thanos-store-${var.cluster-name}"
thanos_bucket_force_destroy = false
thanos_store_config = null
thanos_version = "v0.36.1"
thanos_version = "v0.37.2"
enabled = false
allowed_cidrs = ["0.0.0.0/0"]
default_network_policy = true
Expand Down
6 changes: 3 additions & 3 deletions modules/aws/thanos-memcached.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ locals {
thanos-memcached = merge(
local.helm_defaults,
{
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].name
repository = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].repository
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].version
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/memcached")].name
repository = ""
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/memcached")].version
name = "thanos-memcached"
namespace = local.thanos["namespace"]
enabled = false
Expand Down
8 changes: 4 additions & 4 deletions modules/aws/thanos.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ locals {
thanos = merge(
local.helm_defaults,
{
name = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
repository = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].repository
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].version
name = "thanos"
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].name
repository = ""
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].version
namespace = "monitoring"
create_iam_resources_irsa = true
iam_policy_override = null
Expand Down
2 changes: 1 addition & 1 deletion modules/google/kube-prometheus.tf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ locals {
thanos_bucket = "thanos-store-${var.cluster-name}"
thanos_bucket_force_destroy = false
thanos_store_config = null
thanos_version = "v0.36.1"
thanos_version = "v0.37.2"
thanos_service_account = ""
enabled = false
allowed_cidrs = ["0.0.0.0/0"]
Expand Down
6 changes: 3 additions & 3 deletions modules/google/thanos-memcached.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ locals {
thanos-memcached = merge(
local.helm_defaults,
{
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].name
repository = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].repository
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].version
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/memcached")].name
repository = ""
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/memcached")].version
name = "thanos-memcached"
namespace = local.thanos["namespace"]
enabled = false
Expand Down
8 changes: 4 additions & 4 deletions modules/google/thanos-receive.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ locals {
thanos-receive = merge(
local.helm_defaults,
{
name = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
repository = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].repository
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].version
name = "thanos"
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].name
repository = ""
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].version
namespace = "monitoring"
create_iam_resources = true
iam_policy_override = null
Expand Down
8 changes: 4 additions & 4 deletions modules/google/thanos.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ locals {
thanos = merge(
local.helm_defaults,
{
name = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
repository = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].repository
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].version
name = "thanos"
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].name
repository = ""
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].version
namespace = "monitoring"
create_iam_resources = true
iam_policy_override = null
Expand Down
2 changes: 1 addition & 1 deletion modules/scaleway/kube-prometheus.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ locals {
thanos_bucket = "thanos-store-${var.cluster-name}"
thanos_bucket_region = local.scaleway["region"]
thanos_store_config = null
thanos_version = "v0.36.1"
thanos_version = "v0.37.2"
enabled = false
allowed_cidrs = ["0.0.0.0/0"]
default_network_policy = true
Expand Down
6 changes: 3 additions & 3 deletions modules/scaleway/thanos-memcached.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ locals {
thanos-memcached = merge(
local.helm_defaults,
{
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].name
repository = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].repository
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "memcached")].version
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/memcached")].name
repository = ""
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/memcached")].version
name = "thanos-memcached"
namespace = local.thanos["namespace"]
enabled = false
Expand Down
8 changes: 4 additions & 4 deletions modules/scaleway/thanos.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ locals {
thanos = merge(
local.helm_defaults,
{
name = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].name
repository = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].repository
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "thanos")].version
name = "thanos"
chart = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].name
repository = ""
chart_version = local.helm_dependencies[index(local.helm_dependencies.*.name, "oci://registry-1.docker.io/bitnamicharts/thanos")].version
namespace = "monitoring"
iam_policy_override = null
create_ns = false
Expand Down
Loading