Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

# Override for Makefile
[{Makefile,makefile,GNUmakefile}]
indent_style = tab
indent_size = 4

[Makefile.*]
indent_style = tab
indent_size = 4

[{*.yaml,*.yml,*.md}]
indent_style = space
indent_size = 2

[*.sh]
indent_style = tab
indent_size = 2

[*.{tf,tfvars,tpl,variant}]
indent_style = space
indent_size = 2

[*.json]
insert_final_newline = false
2 changes: 1 addition & 1 deletion .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
"extends": [
"config:base"
]
}
}
1 change: 1 addition & 0 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ repository:
description: This component creates a Helm release for actions-runner-controller on an EKS cluster
homepage: https://cloudposse.com/accelerate
topics: terraform, terraform-component

2 changes: 1 addition & 1 deletion README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ description: |-
```

2. If using the Webhook Driven autoscaling (recommended), generate a random string to use as the Secret when creating
the webhook in GitHub.
the webhook in GitHub.

Generate the string using 1Password (no special characters, length 45) or by running

Expand Down
1 change: 1 addition & 0 deletions docs/.gitkeep
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

2 changes: 1 addition & 1 deletion src/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions src/charts/actions-runner/templates/runnerdeployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ we explicitly convert to boolean based on the string value */}}
{{- $use_dockerconfig := eq (printf "%v" .Values.docker_config_json_enabled) "true" }}
{{- $use_dind := eq (printf "%v" .Values.dind_enabled) "true" }}
{{- /* Historically, the docker daemon was run in a sidecar.
At some point, the option became available to use dockerdWithinRunnerContainer,
and we now default to that. In fact, at this moment, the sidecar option is not configurable.
We keep the logic here in case we need to revert to the sidecar option. */}}
At some point, the option became available to use dockerdWithinRunnerContainer,
and we now default to that. In fact, at this moment, the sidecar option is not configurable.
We keep the logic here in case we need to revert to the sidecar option. */}}
{{- $use_dind_in_runner := $use_dind }}
{{- if $use_pvc }}
---
Expand Down Expand Up @@ -74,7 +74,7 @@ data:
{
"metadata": {
"annotations":
{{- . | toJson | nindent 10 }}
{{- . | toJson | nindent 10 }}
}
}
EOF
Expand Down
4 changes: 2 additions & 2 deletions src/context.tf
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@ variable "descriptor_formats" {
Describe additional descriptors to be output in the `descriptors` output map.
Map of maps. Keys are names of descriptors. Values are maps of the form
`{
format = string
labels = list(string)
format = string
labels = list(string)
}`
(Type is `any` so the map values can later be enhanced to provide additional options.)
`format` is a Terraform format string to be passed to the `format()` function.
Expand Down
4 changes: 2 additions & 2 deletions src/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ output "metadata" {
You may not set both values at the same time, but the following runners have both values set:
${join("\n ", [for k, v in var.runners : k if v.webhook_startup_timeout != null && v.max_duration != null])}

EOT
EOT
}
precondition {
condition = length([
Expand All @@ -22,7 +22,7 @@ output "metadata" {
You may not set both values at the same time, but the following runners have both values set:
${join("\n ", [for k, v in var.runners : k if v.storage != null && v.docker_storage != null])}

EOT
EOT
}
}

Expand Down
Loading