switch to CHANNEL_STANDARD and boolean flag

google_gke/README.md

@@ -45,7 +45,7 @@ Module creates an opinionated GKE cluster plus related resources within a Shared
 | <a name="input_enable_resource_consumption_export"></a> [enable\_resource\_consumption\_export](#input\_enable\_resource\_consumption\_export) | Whether to enable resource consumption metering on this cluster. When enabled, a table will be created in the resource export BigQuery dataset to store resource consumption data. The resulting table can be joined with the resource usage table or with BigQuery billing export. Defaults to true. | `bool` | `true` | no |
 | <a name="input_filestore_csi_driver"></a> [filestore\_csi\_driver](#input\_filestore\_csi\_driver) | The status of the Filestore CSI driver addon, which allows the usage of filestore instance as volumes | `bool` | `false` | no |
 | <a name="input_fuse_csi_driver"></a> [fuse\_csi\_driver](#input\_fuse\_csi\_driver) | The status of the GCSFuse CSI driver addon, which allows the usage of a gcs bucket as volumes | `bool` | `false` | no |
-| <a name="input_gateway_api_config_channel"></a> [gateway\_api\_config\_channel](#input\_gateway\_api\_config\_channel) | The config channel setting to use | `string` | `null` | no |
+| <a name="input_gateway_api_enabled"></a> [gateway\_api\_enabled](#input\_gateway\_api\_enabled) | Enabled Gateway in the GKE Cluster | `bool` | `false` | no |
 | <a name="input_google_group_name"></a> [google\_group\_name](#input\_google\_group\_name) | Name of the Google security group for use with Kubernetes RBAC. Must be in format: [email protected] | `string` | `null` | no |
 | <a name="input_grant_registry_access"></a> [grant\_registry\_access](#input\_grant\_registry\_access) | Grants created cluster-specific service account storage.objectViewer and artifactregistry.reader roles. | `bool` | `true` | no |
 | <a name="input_kubernetes_version"></a> [kubernetes\_version](#input\_kubernetes\_version) | The Kubernetes version of the masters. If set to 'latest' it will pull latest available version. Defaults to 'latest'. | `string` | `"latest"` | no |

google_gke/cluster.tf

@@ -144,10 +144,10 @@ resource "google_container_cluster" "primary" {
 
   # Gateway-api
   dynamic "gateway_api_config" {
-    for_each = var.gateway_api_config_channel != null ? [1] : []
+    for_each = var.gateway_api_enabled ? [1] : []
 
     content {
-      channel = var.gateway_api_config_channel
+      channel = "CHANNEL_STANDARD"
     }
   }
 

google_gke/variables.tf

@@ -307,10 +307,10 @@ variable "service_account_id" {
   type        = string
 }
 
-variable "gateway_api_config_channel" {
-  default     = null
-  description = "The config channel setting to use"
-  type        = string
+variable "gateway_api_enabled" {
+  default     = false
+  description = "Enabled Gateway in the GKE Cluster"
+  type        = bool
 }
 
 variable "monitoring_config_enable_components" {