File tree Expand file tree Collapse file tree 2 files changed +16
-12
lines changed Expand file tree Collapse file tree 2 files changed +16
-12
lines changed Original file line number Diff line number Diff line change @@ -13,6 +13,14 @@ locals {
13
13
]
14
14
]) : item. key => item. value
15
15
}
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
+ ]
16
24
}
17
25
18
26
data "gitlab_metadata" "this" {}
@@ -87,18 +95,14 @@ resource "helm_release" "gitlab_agent" {
87
95
version = var. chart_version
88
96
namespace = var. create_namespace ? kubernetes_namespace. gitlab_agent [0 ]. metadata [0 ]. name : var. namespace
89
97
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
100
102
}
101
- }
103
+ ]
104
+
105
+ set = concat (local. gitlab_agent_set_values , local. gitlab_agent_version_override )
102
106
103
107
values = [<< YAML
104
108
config:
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ terraform {
4
4
required_providers {
5
5
helm = {
6
6
source = " hashicorp/helm"
7
- version = " ~> 2.9 "
7
+ version = " ~> 3.0 "
8
8
}
9
9
gitlab = {
10
10
source = " gitlabhq/gitlab"
You can’t perform that action at this time.
0 commit comments