From c79af78c48ef77041ebfb5fee509cc1a33522bcf Mon Sep 17 00:00:00 2001 From: apichick Date: Sun, 12 Nov 2023 20:21:06 +0100 Subject: [PATCH] Removed options that are not applicable to this load balancer --- modules/net-lb-app-int/README.md | 24 +++++++++++++------ modules/net-lb-app-int/backend-service.tf | 22 ----------------- .../variables-backend-service.tf | 11 --------- 3 files changed, 17 insertions(+), 40 deletions(-) diff --git a/modules/net-lb-app-int/README.md b/modules/net-lb-app-int/README.md index dfc4f5ec..3616494a 100644 --- a/modules/net-lb-app-int/README.md +++ b/modules/net-lb-app-int/README.md @@ -223,7 +223,9 @@ module "ilb-l7" { backends = [{ balancing_mode = "RATE" group = "projects/myprj/zones/europe-west1-a/networkEndpointGroups/my-neg" - max_rate = { per_endpoint = 1 } + max_rate = { + per_endpoint = 1 + } }] } } @@ -259,7 +261,9 @@ module "ilb-l7" { backends = [{ balancing_mode = "RATE" group = "my-neg" - max_rate = { per_endpoint = 1 } + max_rate = { + per_endpoint = 1 + } }] } } @@ -296,7 +300,13 @@ module "ilb-l7" { region = "europe-west1" backend_service_configs = { default = { - backends = [{ group = "my-neg" }] + backends = [{ + balancing_mode = "RATE" + group = "my-neg" + max_rate = { + per_endpoint = 1 + } + }] } } neg_configs = { @@ -518,7 +528,9 @@ module "ilb-l7" { backends = [{ balancing_mode = "RATE" group = "neg-nginx-ew8-c" - max_rate = { per_endpoint = 1 } + max_rate = { + per_endpoint = 1 + } }] } home = { @@ -625,7 +637,6 @@ module "ilb-l7" { - ## Files | name | description | resources | @@ -651,7 +662,7 @@ module "ilb-l7" { | [region](variables.tf#L156) | The region where to allocate the ILB resources. | string | ✓ | | | [vpc_config](variables.tf#L183) | VPC-level configuration. | object({…}) | ✓ | | | [address](variables.tf#L17) | Optional IP address used for the forwarding rule. | string | | null | -| [backend_service_configs](variables-backend-service.tf#L19) | Backend service level configuration. | map(object({…})) | | {} | +| [backend_service_configs](variables-backend-service.tf#L19) | Backend service level configuration. | map(object({…})) | | {} | | [description](variables.tf#L23) | Optional description used for resources. | string | | "Terraform managed." | | [global_access](variables.tf#L30) | Allow client access from all regions. | bool | | null | | [group_configs](variables.tf#L36) | Optional unmanaged groups to create. Can be referenced in backends via key or outputs. | map(object({…})) | | {} | @@ -677,5 +688,4 @@ module "ilb-l7" { | [health_check_ids](outputs.tf#L48) | Autogenerated health check ids. | | | [id](outputs.tf#L55) | Fully qualified forwarding rule id. | | | [neg_ids](outputs.tf#L60) | Autogenerated network endpoint group ids. | | - diff --git a/modules/net-lb-app-int/backend-service.tf b/modules/net-lb-app-int/backend-service.tf index 669a291a..0dcfa46a 100644 --- a/modules/net-lb-app-int/backend-service.tf +++ b/modules/net-lb-app-int/backend-service.tf @@ -114,28 +114,6 @@ resource "google_compute_region_backend_service" "default" { } } - dynamic "connection_tracking_policy" { - for_each = ( - each.value.connection_tracking == null - ? [] - : [each.value.connection_tracking] - ) - iterator = cb - content { - connection_persistence_on_unhealthy_backends = ( - cb.value.persist_conn_on_unhealthy != null - ? cb.value.persist_conn_on_unhealthy - : null - ) - idle_timeout_sec = cb.value.idle_timeout_sec - tracking_mode = ( - cb.value.track_per_session != null - ? cb.value.track_per_session - : null - ) - } - } - dynamic "consistent_hash" { for_each = ( each.value.consistent_hash == null ? [] : [each.value.consistent_hash] diff --git a/modules/net-lb-app-int/variables-backend-service.tf b/modules/net-lb-app-int/variables-backend-service.tf index 5cfe9a5a..728e21db 100644 --- a/modules/net-lb-app-int/variables-backend-service.tf +++ b/modules/net-lb-app-int/variables-backend-service.tf @@ -35,11 +35,6 @@ variable "backend_service_configs" { capacity_scaler = optional(number, 1) description = optional(string, "Terraform managed.") failover = optional(bool, false) - max_connections = optional(object({ - per_endpoint = optional(number) - per_group = optional(number) - per_instance = optional(number) - })) max_rate = optional(object({ per_endpoint = optional(number) per_group = optional(number) @@ -58,11 +53,6 @@ variable "backend_service_configs" { nanos = optional(number) })) })) - connection_tracking = optional(object({ - idle_timeout_sec = optional(number) - persist_conn_on_unhealthy = optional(string) - track_per_session = optional(bool) - })) consistent_hash = optional(object({ http_header_name = optional(string) minimum_ring_size = optional(number) @@ -79,7 +69,6 @@ variable "backend_service_configs" { failover_config = optional(object({ disable_conn_drain = optional(bool) drop_traffic_if_unhealthy = optional(bool) - ratio = optional(number) })) iap_config = optional(object({ oauth2_client_id = string