Skip to content

Commit a39dc53

Browse files
committed
fix: add option for fqdn
1 parent e29d7b8 commit a39dc53

File tree

4 files changed

+33
-4
lines changed

4 files changed

+33
-4
lines changed

main.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ resource "google_compute_managed_ssl_certificate" "this" {
8585
module "helm_release" {
8686
source = "./modules/helm_release"
8787

88+
fqdn = var.fqdn
89+
90+
chart_version = var.chart_version
91+
8892
google_auth = var.google_auth
8993

9094
redis_host = module.redis.redis_host

modules/helm_release/main.tf

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
locals {
2+
3+
other_settings = {
4+
"global.fqdn" = var.fqdn,
5+
}
6+
27
image_tags = {
38
"migrations.image.tag" = "26397ff",
49
"webservice.image.tag" = "0d18a53",
@@ -47,10 +52,11 @@ resource "helm_release" "this" {
4752
name = "ctrlplane"
4853
chart = "ctrlplane"
4954
repository = "https://charts.ctrlplane.dev/"
50-
version = "0.1.15"
55+
version = var.chart_version
5156

5257
dynamic "set" {
5358
for_each = merge(
59+
local.other_settings,
5460
local.image_tags,
5561
local.auth_providers_settings,
5662
local.postgres_settings,

modules/helm_release/variables.tf

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,18 @@ variable "pre_shared_cert" {
5252
}
5353

5454
variable "google_auth" {
55-
type = object({
55+
type = object({
5656
client_id = string
5757
client_secret = string
5858
})
5959
description = "The Google OAuth client ID and secret."
60+
}
61+
62+
variable "chart_version" {
63+
type = string
64+
}
65+
66+
variable "fqdn" {
67+
type = string
68+
default = ""
6069
}

variables.tf

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
variable "fqdn" {
2+
type = string
3+
description = "The fully qualified domain name for the resources."
4+
}
5+
16
variable "namespace" {
27
type = string
38
description = "The name prefix for all resources created."
@@ -45,9 +50,14 @@ variable "domains" {
4550
}
4651

4752
variable "google_auth" {
48-
type = object({
53+
type = object({
4954
client_id = string
5055
client_secret = string
5156
})
5257
description = "The Google OAuth client ID and secret."
53-
}
58+
}
59+
60+
variable "chart_version" {
61+
type = string
62+
default = "0.1.17"
63+
}

0 commit comments

Comments
 (0)