Skip to content
Jump to bottom

Helm syntax #16

Merged
merged 4 commits into from
Mar 6, 2026
Merged

Helm syntax #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6d6aa40
👷 build(values/loki.yml.tpl): update schema for storgae to match upst…
morga471 Jan 21, 2026
88dd9e4
🐛 fix(main.tf): update loki config refs for images
morga471 Jan 21, 2026
f5e018b
update nginx container source
morga471 Jan 22, 2026
d3f4064
add explicit depends_on for loki chart
morga471 Jan 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion copy_images.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 10 additions & 5 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -48,18 +53,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
Expand Down
20 changes: 10 additions & 10 deletions values/loki.yml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down