Merge branch 'main' into release

particuleio · May 13, 2022 · 71c99fa · 71c99fa
2 parents 267b496 + 5b17870
commit 71c99fa
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/modules/aws/kube-prometheus.tf b/modules/aws/kube-prometheus.tf
@@ -18,7 +18,7 @@ locals {
       thanos_bucket                     = "thanos-store-${var.cluster-name}"
       thanos_bucket_force_destroy       = false
       thanos_store_config               = null
-      thanos_version                    = "v0.25.2"
+      thanos_version                    = "v0.26.0"
       enabled                           = false
       allowed_cidrs                     = ["0.0.0.0/0"]
       default_network_policy            = true

diff --git a/modules/aws/tigera-operator.tf b/modules/aws/tigera-operator.tf
@@ -6,7 +6,7 @@ locals {
       chart                  = local.helm_dependencies[index(local.helm_dependencies.*.name, "tigera-operator")].name
       repository             = local.helm_dependencies[index(local.helm_dependencies.*.name, "tigera-operator")].repository
       chart_version          = local.helm_dependencies[index(local.helm_dependencies.*.name, "tigera-operator")].version
-      namespace              = "tigera" #https://github.com/projectcalico/calico/issues/4812
+      namespace              = "tigera-operator"
       create_ns              = true
       enabled                = false
       default_network_policy = true

diff --git a/modules/scaleway/kube-prometheus.tf b/modules/scaleway/kube-prometheus.tf
@@ -12,7 +12,7 @@ locals {
       thanos_bucket           = "thanos-store-${var.cluster-name}"
       thanos_bucket_region    = local.scaleway["region"]
       thanos_store_config     = null
-      thanos_version          = "v0.25.2"
+      thanos_version          = "v0.26.0"
       enabled                 = false
       allowed_cidrs           = ["0.0.0.0/0"]
       default_network_policy  = true