Skip to content

Commit 2cff013

Browse files
Sets a default ENTERPRISE edition for PostgreSQL server defaults
Signed-off-by: PhanikumarThodupunoori <[email protected]>
1 parent b085bed commit 2cff013

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

variables.tf

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ variable "node_pools" {
332332
# Potentially we upgrade Terraform modules and versions and we bump our minimum required terraform version to be >1.3
333333
# then at that time I can deprecate this variable and instead allow the user to configure node_locations per node pool.
334334
# Refer to https://github.com/hashicorp/terraform/issues/29407#issuecomment-1150491619
335+
335336
variable "nodepools_locations" {
336337
description = "GCP zone(s) where the additional node pools will allocate nodes in. Comma separated list."
337338
type = string
@@ -382,7 +383,7 @@ variable "postgres_server_defaults" {
382383
availability_type = "ZONAL"
383384
ssl_enforcement_enabled = true
384385
database_flags = []
385-
edition = null
386+
edition = "ENTERPRISE"
386387
}
387388
}
388389

@@ -391,13 +392,9 @@ variable "postgres_servers" {
391392
description = "Map of PostgreSQL server objects"
392393
type = any
393394
default = {
394-
default = {
395-
server_version = "15"
396-
edition = "ENTERPRISE"
397-
machine_type = "db-custom-4-16384"
398-
}
395+
default = {}
399396
}
400-
397+
401398
# Checking for user provided "default" server
402399
validation {
403400
condition = var.postgres_servers != null ? length(var.postgres_servers) != 0 ? contains(keys(var.postgres_servers), "default") : false : true
@@ -599,7 +596,6 @@ variable "gke_network_policy" {
599596
default = false
600597
}
601598

602-
603599
variable "create_static_kubeconfig" {
604600
description = "Allows the user to create a provider / service account based kube config file"
605601
type = bool

0 commit comments

Comments
 (0)