From 6d6aa40b531b083c8ca86fd39d31248419f06038 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Wed, 21 Jan 2026 17:37:46 -0500 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=91=B7=20build(values/loki.yml.tpl):?= =?UTF-8?q?=20update=20schema=20for=20storgae=20to=20match=20upstream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- values/loki.yml.tpl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/values/loki.yml.tpl b/values/loki.yml.tpl index c1085a8..d6ae27b 100644 --- a/values/loki.yml.tpl +++ b/values/loki.yml.tpl @@ -41,16 +41,16 @@ loki: period: 24h # Storage configuration storage: - type: s3 - bucketNames: - admin: ${s3_bucket_name} - chunks: ${s3_bucket_name} - ruler: ${s3_bucket_name} - s3: - s3: s3://${region} - bucketName: ${s3_bucket_name} - region: ${region} - s3ForcePathStyle: false + bucketNames: + admin: ${s3_bucket_name} + chunks: ${s3_bucket_name} + ruler: ${s3_bucket_name} + storage_cofig: + aws: + s3: + bucketName: ${s3_bucket_name} + region: ${region} + s3ForcePathStyle: false tracing: enabled: true From 88dd9e4376a6abce4bc006129d0fa1b2ca428b04 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Wed, 21 Jan 2026 17:39:35 -0500 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=90=9B=20fix(main.tf):=20update=20lok?= =?UTF-8?q?i=20config=20refs=20for=20images?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.tf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/main.tf b/main.tf index 5e1f256..8b8893b 100644 --- a/main.tf +++ b/main.tf @@ -48,18 +48,18 @@ resource "helm_release" "loki" { loki_image_registry = module.images.images[local.loki_key].dest_registry loki_image_repository = module.images.images[local.loki_key].dest_repository loki_image_tag = module.images.images[local.loki_key].tag - provisioner_image_repository = split(":", module.images.images[local.provisioner_key].dest_full_path)[0] + provisioner_image_repository = module.images.images[local.provisioner_key].dest_repository provisioner_image_tag = module.images.images[local.provisioner_key].tag gateway_image_repository = module.images.images[local.gateway_key].dest_repository gateway_image_tag = module.images.images[local.gateway_key].tag - sidecar_image_repository = split(":", module.images.images[local.sidecar_key].dest_full_path)[0] + sidecar_image_repository = module.images.images[local.sidecar_key].dest_repository sidecar_image_tag = module.images.images[local.sidecar_key].tag - memcached_image_repository = split(":", module.images.images[local.memcached_key].dest_full_path)[0] + memcached_image_repository = module.images.images[local.memcached_key].dest_repository memcached_image_tag = module.images.images[local.memcached_key].tag - exporter_image_repository = split(":", module.images.images[local.exporter_key].dest_full_path)[0] + exporter_image_repository = module.images.images[local.exporter_key].dest_repository exporter_image_tag = module.images.images[local.exporter_key].tag # Storage configuration - s3_bucket_name = module.loki_s3.s3_requested_bucket_name + s3_bucket_name = module.loki_s3.s3_module_settings.bucket_name region = var.region # Storage classes rwo_storage_class = var.rwo_storage_class From f5e018b57fed2b2dc76c5772c6c63746f6cc1d01 Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Thu, 22 Jan 2026 14:37:11 -0500 Subject: [PATCH 3/4] update nginx container source --- copy_images.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/copy_images.tf b/copy_images.tf index 2e482a3..4264bfc 100644 --- a/copy_images.tf +++ b/copy_images.tf @@ -57,7 +57,7 @@ locals { enabled = true dest_path = null name = "grafana/nginx-unprivileged" - source_image = "opensource/nginx/nginx-alpine" + source_image = "opensource/nginx/nginx" source_registry = format("%v/%v", local.ent_ecr_source, "ironbank") source_tag = var.gateway_tag tag = var.gateway_tag From d3f4064b71baedf623ab574e3abf9fabc22a46fa Mon Sep 17 00:00:00 2001 From: "Matthew C. Morgan" Date: Thu, 22 Jan 2026 15:01:58 -0500 Subject: [PATCH 4/4] add explicit depends_on for loki chart --- main.tf | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/main.tf b/main.tf index 8b8893b..7ecb133 100644 --- a/main.tf +++ b/main.tf @@ -30,6 +30,11 @@ module "loki_irsa_role" { } resource "helm_release" "loki" { + depends_on = [ + module.images, + module.loki_irsa_role, + module.loki_s3 + ] atomic = true chart = "loki" cleanup_on_fail = true