Skip to content

Commit 561a6d4

Browse files
authored
feat: expose docker registry setting for project cleanup (#250)
1 parent 201c46c commit 561a6d4

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

modules/project_cleanup/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ The following services must be enabled on the project housing the cleanup functi
3131
| clean\_up\_org\_level\_cai\_feeds | Clean up organization level Cloud Asset Inventory Feeds. | `bool` | `false` | no |
3232
| clean\_up\_org\_level\_scc\_notifications | Clean up organization level Security Command Center notifications. | `bool` | `false` | no |
3333
| clean\_up\_org\_level\_tag\_keys | Clean up organization level Tag Keys. | `bool` | `false` | no |
34+
| function\_docker\_registry | Docker Registry to use for storing the function's Docker images. Allowed values are CONTAINER\_REGISTRY (default) and ARTIFACT\_REGISTRY. | `string` | `null` | no |
3435
| function\_timeout\_s | The amount of time in seconds allotted for the execution of the function. | `number` | `500` | no |
3536
| job\_schedule | Cleaner function run frequency, in cron syntax | `string` | `"*/5 * * * *"` | no |
3637
| list\_billing\_sinks\_page\_size | The maximum number of Billing Account Log Sinks to return in the call to `BillingAccountsSinksService.List` service. | `number` | `200` | no |

modules/project_cleanup/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ module "scheduled_project_cleaner" {
5959
function_runtime = "go121"
6060
function_service_account_email = google_service_account.project_cleaner_function.email
6161
function_timeout_s = var.function_timeout_s
62+
function_docker_registry = var.function_docker_registry
6263

6364
function_environment_variables = {
6465
TARGET_ORGANIZATION_ID = var.organization_id

modules/project_cleanup/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,3 +148,9 @@ variable "target_folder_id" {
148148
description = "Folder ID to delete all projects under."
149149
default = ""
150150
}
151+
152+
variable "function_docker_registry" {
153+
type = string
154+
default = null
155+
description = "Docker Registry to use for storing the function's Docker images. Allowed values are CONTAINER_REGISTRY (default) and ARTIFACT_REGISTRY."
156+
}

0 commit comments

Comments
 (0)