Skip to content

Commit d62ab2c

Browse files
authored
Merge pull request #19 from cookielab/renovate/helm-3.x
chore(deps): update terraform helm to v3
2 parents b6b2785 + 9a4c526 commit d62ab2c

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

main.tf

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ locals {
1313
]
1414
]) : item.key => item.value
1515
}
16+
17+
gitlab_agent_set_values = []
18+
gitlab_agent_version_override = var.agent_version == null ? [] : [
19+
{
20+
name = "image.tag"
21+
value = var.agent_version
22+
}
23+
]
1624
}
1725

1826
data "gitlab_metadata" "this" {}
@@ -87,18 +95,14 @@ resource "helm_release" "gitlab_agent" {
8795
version = var.chart_version
8896
namespace = var.create_namespace ? kubernetes_namespace.gitlab_agent[0].metadata[0].name : var.namespace
8997

90-
set_sensitive {
91-
name = "config.token"
92-
value = gitlab_cluster_agent_token.this.token
93-
}
94-
95-
dynamic "set" {
96-
for_each = var.agent_version == null ? {} : { yes = "1" }
97-
content {
98-
name = "image.tag"
99-
value = var.agent_version
98+
set_sensitive = [
99+
{
100+
name = "config.token"
101+
value = gitlab_cluster_agent_token.this.token
100102
}
101-
}
103+
]
104+
105+
set = concat(local.gitlab_agent_set_values, local.gitlab_agent_version_override)
102106

103107
values = [<<YAML
104108
config:

versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
helm = {
66
source = "hashicorp/helm"
7-
version = "~> 2.9"
7+
version = "~> 3.0"
88
}
99
gitlab = {
1010
source = "gitlabhq/gitlab"

0 commit comments

Comments
 (0)