Skip to content

Commit 247f735

Browse files
feat(helm>=3)!: Update 'set' syntax in helm_resource to support v3 (#220)
Co-authored-by: Andrew Peabody <andrewpeabody@google.com>
1 parent 9c9c95c commit 247f735

File tree

5 files changed

+25
-24
lines changed

5 files changed

+25
-24
lines changed

examples/gh-runner-gke-dind-rootless/providers.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ provider "kubernetes" {
2828
}
2929

3030
provider "helm" {
31-
kubernetes {
31+
kubernetes = {
3232
host = "https://${module.runner-gke.kubernetes_endpoint}"
3333
token = data.google_client_config.default.access_token
3434
cluster_ca_certificate = base64decode(module.runner-gke.ca_certificate)
35-
exec {
35+
exec = {
3636
api_version = "client.authentication.k8s.io/v1beta1"
3737
command = "gke-gcloud-auth-plugin"
3838
}

examples/gh-runner-gke-dind/providers.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ provider "kubernetes" {
2828
}
2929

3030
provider "helm" {
31-
kubernetes {
31+
kubernetes = {
3232
host = "https://${module.runner-gke.kubernetes_endpoint}"
3333
token = data.google_client_config.default.access_token
3434
cluster_ca_certificate = base64decode(module.runner-gke.ca_certificate)
35-
exec {
35+
exec = {
3636
api_version = "client.authentication.k8s.io/v1beta1"
3737
command = "gke-gcloud-auth-plugin"
3838
}

examples/gh-runner-gke-simple/providers.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ provider "kubernetes" {
2828
}
2929

3030
provider "helm" {
31-
kubernetes {
31+
kubernetes = {
3232
host = "https://${module.runner-gke.kubernetes_endpoint}"
3333
token = data.google_client_config.default.access_token
3434
cluster_ca_certificate = base64decode(module.runner-gke.ca_certificate)
35-
exec {
35+
exec = {
3636
api_version = "client.authentication.k8s.io/v1beta1"
3737
command = "gke-gcloud-auth-plugin"
3838
}

modules/gh-runner-gke/main.tf

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -127,23 +127,24 @@ resource "helm_release" "arc_runners_set" {
127127
chart = "oci://ghcr.io/actions/actions-runner-controller-charts/gha-runner-scale-set"
128128
version = var.arc_runners_version
129129

130-
set {
131-
name = "githubConfigSecret"
132-
value = kubernetes_secret.gh_app_pre_defined_secret.metadata[0].name
133-
}
134-
135-
set {
136-
name = "githubConfigUrl"
137-
value = var.gh_config_url
138-
}
139-
140-
dynamic "set" {
141-
for_each = var.arc_container_mode == "" ? [] : [1]
142-
content {
143-
name = "containerMode.type"
144-
value = var.arc_container_mode
145-
}
146-
}
130+
set = concat(
131+
[
132+
{
133+
name = "githubConfigSecret"
134+
value = kubernetes_secret.gh_app_pre_defined_secret.metadata[0].name
135+
},
136+
{
137+
name = "githubConfigUrl"
138+
value = var.gh_config_url
139+
}
140+
],
141+
var.arc_container_mode == "" ? [] : [
142+
{
143+
name = "containerMode.type"
144+
value = var.arc_container_mode
145+
}
146+
]
147+
)
147148

148149
values = var.arc_runners_values
149150
}

modules/gh-runner-gke/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ terraform {
3535

3636
helm = {
3737
source = "hashicorp/helm"
38-
version = "~> 2.0"
38+
version = "~> 3.0"
3939
}
4040
}
4141

0 commit comments

Comments
 (0)