Skip to content

Commit

Permalink
fix: bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
jsbroks committed Sep 26, 2024
1 parent 6370c5d commit a548ec9
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 5 deletions.
2 changes: 2 additions & 0 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 12 additions & 4 deletions modules/helm_release/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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"
Expand All @@ -78,4 +84,6 @@ resource "helm_release" "this" {
value = set.value
}
}

values = [yamlencode(local.merged_values)]
}
4 changes: 4 additions & 0 deletions modules/helm_release/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,7 @@ variable "github_bot" {
description = "The GitHub bot user and token."
default = null
}

variable "values" {
type = map(any)
}
7 changes: 6 additions & 1 deletion variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ variable "google_auth" {

variable "chart_version" {
type = string
default = "0.1.23"
default = "0.1.28"
}

variable "github_bot" {
Expand All @@ -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 } }
}

0 comments on commit a548ec9

Please sign in to comment.