Skip to content

Commit 9146b2e

Browse files
committed
Change terraform config to use new syntax.
1 parent d71deb6 commit 9146b2e

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

.github/gh-actions-self-hosted-runners/arc/helm.tf

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,16 @@ resource "helm_release" "cert-manager" {
2222
create_namespace = true
2323
repository = "https://charts.jetstack.io"
2424
chart = "cert-manager"
25-
25+
2626
atomic = "true"
2727
timeout = 100
2828

29-
set {
30-
name = "installCRDs"
31-
value = "true"
32-
}
29+
set = [
30+
{
31+
name = "installCRDs"
32+
value = "true"
33+
}
34+
]
3335
depends_on = [ google_container_node_pool.main-actions-runner-pool ]
3436
}
3537

@@ -43,12 +45,11 @@ resource "helm_release" "arc" {
4345
atomic = "true"
4446
timeout = 120
4547

46-
dynamic "set" {
47-
for_each = local.arc_values
48-
content {
49-
name = set.key
50-
value = set.value
48+
set = [
49+
for k, v in local.arc_values : {
50+
name = k
51+
value = v
5152
}
52-
}
53+
]
5354
depends_on = [ helm_release.cert-manager ]
5455
}

.github/gh-actions-self-hosted-runners/arc/provider.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ terraform {
2525
required_providers {
2626
google = {
2727
source = "hashicorp/google"
28-
version = "~> 4.62.0"
28+
version = "~> 6.7.0"
2929
}
3030
kubectl = {
3131
source = "alekc/kubectl"
@@ -40,7 +40,7 @@ provider "google" {
4040
}
4141

4242
provider "helm" {
43-
kubernetes {
43+
kubernetes = {
4444
host = "https://${google_container_cluster.actions-runner-gke.endpoint}"
4545
token = data.google_client_config.provider.access_token
4646
cluster_ca_certificate = base64decode(google_container_cluster.actions-runner-gke.master_auth.0.cluster_ca_certificate)
@@ -66,4 +66,4 @@ provider "github" {
6666
}
6767
owner = var.organization
6868

69-
}
69+
}

0 commit comments

Comments
 (0)