fix(thanos): use oci repo

Signed-off-by: Kevin Lefevre <archi@kiln.fi>
particuleio · Dec 18, 2024 · 2f5d622 · 2f5d622
1 parent d9bfbc1
commit 2f5d622
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 25 deletions.
diff --git a/modules/aws/thanos-memcached.tf b/modules/aws/thanos-memcached.tf
@@ -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

diff --git a/modules/aws/thanos.tf b/modules/aws/thanos.tf
@@ -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

diff --git a/modules/google/thanos-memcached.tf b/modules/google/thanos-memcached.tf
@@ -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

diff --git a/modules/google/thanos-receive.tf b/modules/google/thanos-receive.tf
@@ -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

diff --git a/modules/google/thanos.tf b/modules/google/thanos.tf
@@ -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

diff --git a/modules/scaleway/thanos-memcached.tf b/modules/scaleway/thanos-memcached.tf
@@ -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

diff --git a/modules/scaleway/thanos.tf b/modules/scaleway/thanos.tf
@@ -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