Skip to content

Commit a548ec9

Browse files
committed
fix: bump versions
1 parent 6370c5d commit a548ec9

File tree

4 files changed

+24
-5
lines changed

4 files changed

+24
-5
lines changed

main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,8 @@ module "helm_release" {
9393

9494
github_bot = var.github_bot
9595

96+
values = var.helm_values
97+
9698
redis_host = module.redis.redis_host
9799
redis_port = module.redis.redis_port
98100
redis_password = module.redis.redis_auth_string

modules/helm_release/main.tf

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ locals {
55
}
66

77
image_tags = {
8-
"webservice.image.tag" = "1675b2b",
9-
"migrations.image.tag" = "5dd5951",
10-
"event-worker.image.tag" = "3194fbe",
11-
"job-policy-checker.image.tag" = "3194fbe",
8+
"webservice.image.tag" = "cc9109e",
9+
"migrations.image.tag" = "c478a3c",
10+
"event-worker.image.tag" = "a29ef6c",
11+
"job-policy-checker.image.tag" = "a29ef6c",
1212
}
1313

1414
postgres_settings = {
@@ -56,6 +56,12 @@ locals {
5656
}
5757
}
5858

59+
locals {
60+
default_values = {}
61+
# Merge default values with overrides
62+
merged_values = merge(local.default_values, var.values)
63+
}
64+
5965
resource "helm_release" "this" {
6066
name = "ctrlplane"
6167
chart = "ctrlplane"
@@ -78,4 +84,6 @@ resource "helm_release" "this" {
7884
value = set.value
7985
}
8086
}
87+
88+
values = [yamlencode(local.merged_values)]
8189
}

modules/helm_release/variables.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,7 @@ variable "github_bot" {
7979
description = "The GitHub bot user and token."
8080
default = null
8181
}
82+
83+
variable "values" {
84+
type = map(any)
85+
}

variables.tf

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ variable "google_auth" {
5959

6060
variable "chart_version" {
6161
type = string
62-
default = "0.1.23"
62+
default = "0.1.28"
6363
}
6464

6565
variable "github_bot" {
@@ -73,3 +73,8 @@ variable "github_bot" {
7373
description = "The GitHub bot user and token."
7474
default = null
7575
}
76+
77+
variable "helm_values" {
78+
type = any
79+
default = { otel = { install = true } }
80+
}

0 commit comments

Comments
 (0)