diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..e282a8e --- /dev/null +++ b/.editorconfig @@ -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 diff --git a/.github/renovate.json b/.github/renovate.json index 47cf066..2921be4 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -3,4 +3,4 @@ "extends": [ "config:base" ] -} +} \ No newline at end of file diff --git a/.github/settings.yml b/.github/settings.yml index 8986808..4ff86c9 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -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 + diff --git a/README.md b/README.md index 39f2eec..1d288ad 100644 --- a/README.md +++ b/README.md @@ -277,7 +277,7 @@ AWS_PROFILE=acme-mgmt-use2-auto-admin chamber write github_runners controller_gi ``` 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 diff --git a/README.yaml b/README.yaml index 1806abe..96a626c 100644 --- a/README.yaml +++ b/README.yaml @@ -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 diff --git a/docs/.gitkeep b/docs/.gitkeep index e69de29..8b13789 100644 --- a/docs/.gitkeep +++ b/docs/.gitkeep @@ -0,0 +1 @@ + diff --git a/src/README.md b/src/README.md index 53f2731..5705db4 100644 --- a/src/README.md +++ b/src/README.md @@ -258,7 +258,7 @@ AWS_PROFILE=acme-mgmt-use2-auto-admin chamber write github_runners controller_gi ``` 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 diff --git a/src/charts/actions-runner/templates/runnerdeployment.yaml b/src/charts/actions-runner/templates/runnerdeployment.yaml index 97382fe..3bbfb3b 100644 --- a/src/charts/actions-runner/templates/runnerdeployment.yaml +++ b/src/charts/actions-runner/templates/runnerdeployment.yaml @@ -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 }} --- @@ -74,7 +74,7 @@ data: { "metadata": { "annotations": - {{- . | toJson | nindent 10 }} + {{- . | toJson | nindent 10 }} } } EOF diff --git a/src/context.tf b/src/context.tf index 5e0ef88..e7dd3ea 100644 --- a/src/context.tf +++ b/src/context.tf @@ -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. diff --git a/src/outputs.tf b/src/outputs.tf index 0c68538..ac86bae 100644 --- a/src/outputs.tf +++ b/src/outputs.tf @@ -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([ @@ -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 } }