From a548ec9e5fc4afb3524c4991052ad89f5b5cf5e8 Mon Sep 17 00:00:00 2001
From: Justin Brooks <jsbroks@gmail.com>
Date: Thu, 26 Sep 2024 01:27:04 -0400
Subject: [PATCH] fix: bump versions

---
 main.tf                           |  2 ++
 modules/helm_release/main.tf      | 16 ++++++++++++----
 modules/helm_release/variables.tf |  4 ++++
 variables.tf                      |  7 ++++++-
 4 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/main.tf b/main.tf
index f940b2a..69d0b05 100644
--- a/main.tf
+++ b/main.tf
@@ -93,6 +93,8 @@ module "helm_release" {
 
   github_bot = var.github_bot
 
+  values = var.helm_values
+
   redis_host     = module.redis.redis_host
   redis_port     = module.redis.redis_port
   redis_password = module.redis.redis_auth_string
diff --git a/modules/helm_release/main.tf b/modules/helm_release/main.tf
index 39bd276..b91dfd2 100644
--- a/modules/helm_release/main.tf
+++ b/modules/helm_release/main.tf
@@ -5,10 +5,10 @@ locals {
   }
 
   image_tags = {
-    "webservice.image.tag"         = "1675b2b",
-    "migrations.image.tag"         = "5dd5951",
-    "event-worker.image.tag"       = "3194fbe",
-    "job-policy-checker.image.tag" = "3194fbe",
+    "webservice.image.tag"         = "cc9109e",
+    "migrations.image.tag"         = "c478a3c",
+    "event-worker.image.tag"       = "a29ef6c",
+    "job-policy-checker.image.tag" = "a29ef6c",
   }
 
   postgres_settings = {
@@ -56,6 +56,12 @@ locals {
   }
 }
 
+locals {
+  default_values = {}
+  # Merge default values with overrides
+  merged_values = merge(local.default_values, var.values)
+}
+
 resource "helm_release" "this" {
   name       = "ctrlplane"
   chart      = "ctrlplane"
@@ -78,4 +84,6 @@ resource "helm_release" "this" {
       value = set.value
     }
   }
+
+  values = [yamlencode(local.merged_values)]
 }
diff --git a/modules/helm_release/variables.tf b/modules/helm_release/variables.tf
index e43a76d..bc2c74e 100644
--- a/modules/helm_release/variables.tf
+++ b/modules/helm_release/variables.tf
@@ -79,3 +79,7 @@ variable "github_bot" {
   description = "The GitHub bot user and token."
   default     = null
 }
+
+variable "values" {
+  type = map(any)
+}
\ No newline at end of file
diff --git a/variables.tf b/variables.tf
index 1f5f741..dda2edc 100644
--- a/variables.tf
+++ b/variables.tf
@@ -59,7 +59,7 @@ variable "google_auth" {
 
 variable "chart_version" {
   type    = string
-  default = "0.1.23"
+  default = "0.1.28"
 }
 
 variable "github_bot" {
@@ -73,3 +73,8 @@ variable "github_bot" {
   description = "The GitHub bot user and token."
   default     = null
 }
+
+variable "helm_values" {
+  type    = any
+  default = { otel = { install = true } }
+}
\ No newline at end of file