FAQ | This is a LIVE service | Changelog

Commit 993db4d1 authored by Dr Rich Wareham's avatar Dr Rich Wareham
Browse files

Merge branch 'allow-min-scale' into 'master'

Use Google Beta provider to allow for min-scale option

See merge request !16
parents 1db58428 60946f5c
Pipeline #59081 passed with stage
in 48 seconds
......@@ -6,4 +6,10 @@ locals {
# Should a DNS domain mapping be created?
domain_mapping_present = var.dns_name != ""
# Do we need to enable the 'beta' launch stage - only required if certain beta
# functionality is being used, or if `enable_beta_launch_stage` is set downstream
enable_beta_launch_stage = (
var.enable_beta_launch_stage || var.allowed_ingress != "all" || var.min_scale > 0
)
}
......@@ -38,7 +38,7 @@ resource "google_cloud_run_service" "webapp" {
},
# Add the beta launch stage if required.
var.allowed_ingress != "all" ? {
local.enable_beta_launch_stage ? {
# Required to be able to set ingress type.
"run.googleapis.com/launch-stage" : "BETA",
} : {},
......
......@@ -163,3 +163,8 @@ variable "template_annotations" {
template.
EOL
}
variable "enable_beta_launch_stage" {
default = false
description = "Force use of the 'BETA' launch stage for the service."
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment