File tree Expand file tree Collapse file tree 5 files changed +25
-24
lines changed
gh-runner-gke-dind-rootless Expand file tree Collapse file tree 5 files changed +25
-24
lines changed Original file line number Diff line number Diff line change @@ -28,11 +28,11 @@ provider "kubernetes" {
28
28
}
29
29
30
30
provider "helm" {
31
- kubernetes {
31
+ kubernetes = {
32
32
host = " https://${ module . runner-gke . kubernetes_endpoint } "
33
33
token = data.google_client_config.default.access_token
34
34
cluster_ca_certificate = base64decode (module. runner-gke . ca_certificate )
35
- exec {
35
+ exec = {
36
36
api_version = " client.authentication.k8s.io/v1beta1"
37
37
command = " gke-gcloud-auth-plugin"
38
38
}
Original file line number Diff line number Diff line change @@ -28,11 +28,11 @@ provider "kubernetes" {
28
28
}
29
29
30
30
provider "helm" {
31
- kubernetes {
31
+ kubernetes = {
32
32
host = " https://${ module . runner-gke . kubernetes_endpoint } "
33
33
token = data.google_client_config.default.access_token
34
34
cluster_ca_certificate = base64decode (module. runner-gke . ca_certificate )
35
- exec {
35
+ exec = {
36
36
api_version = " client.authentication.k8s.io/v1beta1"
37
37
command = " gke-gcloud-auth-plugin"
38
38
}
Original file line number Diff line number Diff line change @@ -28,11 +28,11 @@ provider "kubernetes" {
28
28
}
29
29
30
30
provider "helm" {
31
- kubernetes {
31
+ kubernetes = {
32
32
host = " https://${ module . runner-gke . kubernetes_endpoint } "
33
33
token = data.google_client_config.default.access_token
34
34
cluster_ca_certificate = base64decode (module. runner-gke . ca_certificate )
35
- exec {
35
+ exec = {
36
36
api_version = " client.authentication.k8s.io/v1beta1"
37
37
command = " gke-gcloud-auth-plugin"
38
38
}
Original file line number Diff line number Diff line change @@ -127,23 +127,24 @@ resource "helm_release" "arc_runners_set" {
127
127
chart = " oci://ghcr.io/actions/actions-runner-controller-charts/gha-runner-scale-set"
128
128
version = var. arc_runners_version
129
129
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
+ )
147
148
148
149
values = var. arc_runners_values
149
150
}
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ terraform {
35
35
36
36
helm = {
37
37
source = " hashicorp/helm"
38
- version = " ~> 2 .0"
38
+ version = " ~> 3 .0"
39
39
}
40
40
}
41
41
You can’t perform that action at this time.
0 commit comments