fix: deprecated acl attribute on scaleway buckets

particuleio · Sep 16, 2024 · a7796de · a7796de
1 parent f2c4498
commit a7796de
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/modules/scaleway/kube-prometheus.tf b/modules/scaleway/kube-prometheus.tf
@@ -288,7 +288,12 @@ resource "kubernetes_namespace" "kube-prometheus-stack" {
 resource "scaleway_object_bucket" "kube-prometheus-stack_thanos_bucket" {
   count = local.kube-prometheus-stack["enabled"] && local.kube-prometheus-stack["thanos_sidecar_enabled"] && local.kube-prometheus-stack["thanos_create_bucket"] ? 1 : 0
   name  = local.kube-prometheus-stack["thanos_bucket"]
-  acl   = "private"
+}
+
+resource "scaleway_object_bucket_acl" "kube-prometheus-stack_bucket_acl" {
+  count = local.kube-prometheus-stack["enabled"] && local.kube-prometheus-stack["thanos_sidecar_enabled"] && local.kube-prometheus-stack["thanos_create_bucket"] ? 1 : 0
+  bucket = scaleway_object_bucket.kube-prometheus-stack_bucket.0.id
+  acl = "private"
 }
 
 resource "random_string" "grafana_password" {

diff --git a/modules/scaleway/loki-stack.tf b/modules/scaleway/loki-stack.tf
@@ -233,7 +233,12 @@ resource "kubernetes_secret" "loki-stack-ca" {
 resource "scaleway_object_bucket" "loki_bucket" {
   count = local.loki-stack["enabled"] && local.loki-stack["create_bucket"] ? 1 : 0
   name  = local.loki-stack["bucket"]
-  acl   = "private"
+}
+
+resource "scaleway_object_bucket_acl" "loki_bucket_acl" {
+  count = local.loki-stack["enabled"] && local.loki-stack["create_bucket"] ? 1 : 0
+  bucket = scaleway_object_bucket.loki_bucket.0.id
+  acl = "private"
 }
 
 resource "tls_private_key" "promtail-key" {

diff --git a/modules/scaleway/thanos.tf b/modules/scaleway/thanos.tf
@@ -211,7 +211,12 @@ locals {
 resource "scaleway_object_bucket" "thanos_bucket" {
   count = local.thanos["enabled"] && local.thanos["create_bucket"] ? 1 : 0
   name  = local.thanos["bucket"]
-  acl   = "private"
+}
+
+resource "scaleway_object_bucket_acl" "thanos_bucket_acl" {
+  count = local.thanos["enabled"] && local.thanos["create_bucket"] ? 1 : 0
+  bucket = scaleway_object_bucket.thanos_bucket.0.id
+  acl = "private"
 }
 
 resource "kubernetes_namespace" "thanos" {