Skip to content

Commit 5f7d53c

Browse files
fix!: making location field as required for standard cluster (#2495)
Co-authored-by: Andrew Peabody <[email protected]>
1 parent dc798c1 commit 5f7d53c

File tree

4 files changed

+2
-3
lines changed

4 files changed

+2
-3
lines changed

modules/gke-standard-cluster/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ For a module with a complete configuration of a Google Cloud Platform Kubernetes
4343
| in\_transit\_encryption\_config | Defines the config of in-transit encryption. Valid values are `IN_TRANSIT_ENCRYPTION_DISABLED` and `IN_TRANSIT_ENCRYPTION_INTER_NODE_TRANSPARENT`. | `string` | `null` | no |
4444
| initial\_node\_count | The number of nodes to create in this cluster's default node pool. In regional or multi-zonal clusters, this is the number of nodes per zone. Must be set if node\_pool is not specified. | `number` | `0` | no |
4545
| ip\_allocation\_policy | Configuration of cluster IP allocation for VPC-native clusters. If this block is unset during creation, it will be set by the GKE backend. | <pre>object({<br> cluster_secondary_range_name = optional(string)<br> services_secondary_range_name = optional(string)<br> cluster_ipv4_cidr_block = optional(string)<br> services_ipv4_cidr_block = optional(string)<br> stack_type = optional(string)<br> additional_pod_ranges_config = optional(object({<br> pod_range_names = list(string)<br> }))<br> })</pre> | `null` | no |
46-
| location | The location (region or zone) in which the cluster master will be created, as well as the default node location. If you specify a zone (such as us-central1-a), the cluster will be a zonal cluster with a single cluster master. If you specify a region (such as us-west1), the cluster will be a regional cluster with multiple masters spread across zones in the region, and with default node locations in those zones as well. | `string` | `null` | no |
46+
| location | The location (region or zone) in which the cluster master will be created, as well as the default node location. If you specify a zone (such as us-central1-a), the cluster will be a zonal cluster with a single cluster master. If you specify a region (such as us-west1), the cluster will be a regional cluster with multiple masters spread across zones in the region, and with default node locations in those zones as well. | `string` | n/a | yes |
4747
| logging\_config | Logging configuration for the cluster. | <pre>object({<br> enable_components = optional(list(string))<br> })</pre> | `null` | no |
4848
| logging\_service | The logging service that the cluster should write logs to. Available options include `logging.googleapis.com`, `logging.googleapis.com/kubernetes`, and `none`. | `string` | `null` | no |
4949
| maintenance\_policy | The maintenance policy to use for the cluster. | <pre>object({<br> daily_maintenance_window = optional(object({<br> start_time = optional(string)<br> }))<br> recurring_window = optional(object({<br> start_time = optional(string)<br> end_time = optional(string)<br> recurrence = optional(string)<br> }))<br> maintenance_exclusion = optional(list(object({<br> exclusion_name = optional(string)<br> start_time = optional(string)<br> end_time = optional(string)<br> exclusion_options = optional(object({<br> scope = optional(string)<br> }))<br> })))<br> })</pre> | `null` | no |

modules/gke-standard-cluster/metadata.display.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ spec:
318318
location:
319319
name: location
320320
title: Location
321-
level: 1
322321
logging_config:
323322
name: logging_config
324323
title: Logging Config

modules/gke-standard-cluster/metadata.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ spec:
142142
- name: location
143143
description: The location (region or zone) in which the cluster master will be created, as well as the default node location. If you specify a zone (such as us-central1-a), the cluster will be a zonal cluster with a single cluster master. If you specify a region (such as us-west1), the cluster will be a regional cluster with multiple masters spread across zones in the region, and with default node locations in those zones as well.
144144
varType: string
145+
required: true
145146
- name: network
146147
description: The name or self_link of the Google Compute Engine network to which the cluster is connected. For Shared VPC, this network must be in the host project.
147148
varType: string

modules/gke-standard-cluster/variables.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ variable "project_id" {
3434
variable "location" {
3535
description = "The location (region or zone) in which the cluster master will be created, as well as the default node location. If you specify a zone (such as us-central1-a), the cluster will be a zonal cluster with a single cluster master. If you specify a region (such as us-west1), the cluster will be a regional cluster with multiple masters spread across zones in the region, and with default node locations in those zones as well."
3636
type = string
37-
default = null
3837
}
3938

4039
variable "network" {

0 commit comments

Comments
 (0)