From b27a316c987cbcf1bb7b844920a5c3d9399c29d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Svantesson?= Date: Tue, 21 Sep 2021 21:02:46 +0200 Subject: [PATCH] feat: Add values for jx-git-operator chart (#306) fixes #303 --- main.tf | 1 + modules/cluster/charts.tf | 2 ++ modules/cluster/variables.tf | 6 ++++++ variables.tf | 6 ++++++ 4 files changed, 15 insertions(+) diff --git a/main.tf b/main.tf index 11900db..5efc356 100644 --- a/main.tf +++ b/main.tf @@ -78,6 +78,7 @@ module "cluster" { lt_desired_nodes_per_subnet = var.lt_desired_nodes_per_subnet lt_min_nodes_per_subnet = var.lt_min_nodes_per_subnet lt_max_nodes_per_subnet = var.lt_max_nodes_per_subnet + jx_git_operator_values = var.jx_git_operator_values jx_git_url = var.jx_git_url jx_bot_username = var.jx_bot_username jx_bot_token = var.jx_bot_token diff --git a/modules/cluster/charts.tf b/modules/cluster/charts.tf index e4be41b..18845f6 100644 --- a/modules/cluster/charts.tf +++ b/modules/cluster/charts.tf @@ -7,6 +7,8 @@ resource "helm_release" "jx-git-operator" { version = "0.0.194" create_namespace = true + values = var.jx_git_operator_values + set { name = "bootServiceAccount.enabled" value = true diff --git a/modules/cluster/variables.tf b/modules/cluster/variables.tf index 1909ab0..b268819 100644 --- a/modules/cluster/variables.tf +++ b/modules/cluster/variables.tf @@ -263,6 +263,12 @@ variable "lt_max_nodes_per_subnet" { default = 2 } +variable "jx_git_operator_values" { + description = "Extra values for jx-git-operator chart as a list of yaml formated strings" + type = list(string) + default = [] +} + variable "jx_git_url" { description = "URL for the Jenins X cluster git repository" type = string diff --git a/variables.tf b/variables.tf index 17e4326..bb3cf79 100644 --- a/variables.tf +++ b/variables.tf @@ -400,6 +400,12 @@ variable "registry" { default = "" } +variable "jx_git_operator_values" { + description = "Extra values for jx-git-operator chart as a list of yaml formated strings" + type = list(string) + default = [] +} + variable "jx_git_url" { description = "URL for the Jenkins X cluster git repository" type = string