add back

Author: florenciacomuzzi

README.md

@@ -104,6 +104,7 @@ No resources.
 | <a name="input_cluster_autoscaling_max_cpu"></a> [cluster\_autoscaling\_max\_cpu](#input\_cluster\_autoscaling\_max\_cpu) | The maximum CPU usage across all node pools to trigger the cluster autoscaler to provision more node pools | `string` | `"8"` | no |
 | <a name="input_cluster_autoscaling_max_memory_gb"></a> [cluster\_autoscaling\_max\_memory\_gb](#input\_cluster\_autoscaling\_max\_memory\_gb) | The maximum memory usage across all node pools to trigger the cluster autoscaler to provision more node pools | `string` | `"32"` | no |
 | <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | The name of the GKE cluster | `string` | n/a | yes |
+| <a name="input_cluster_secondary_range_cidr"></a> [cluster\_secondary\_range\_cidr](#input\_cluster\_secondary\_range\_cidr) | The secondary range to use for pods | `string` | n/a | yes |
 | <a name="input_cluster_secondary_range_name"></a> [cluster\_secondary\_range\_name](#input\_cluster\_secondary\_range\_name) | The name of the secondary range to use for pods | `string` | `"gke-pods"` | no |
 | <a name="input_jump_host_ip_address"></a> [jump\_host\_ip\_address](#input\_jump\_host\_ip\_address) | The internal IP address of the jump host | `string` | n/a | yes |
 | <a name="input_jump_host_ip_address_name"></a> [jump\_host\_ip\_address\_name](#input\_jump\_host\_ip\_address\_name) | Name of the IP address resource | `string` | `"jump-host-ip"` | no |
@@ -114,6 +115,7 @@ No resources.
 | <a name="input_node_pools"></a> [node\_pools](#input\_node\_pools) | The node pools to create | <pre>list(object({<br/>    name                 = string<br/>    node_disk_size_gb    = string<br/>    node_machine_type    = string<br/>    total_min_node_count = number<br/>    total_max_node_count = number<br/>  }))</pre> | n/a | yes |
 | <a name="input_project_id"></a> [project\_id](#input\_project\_id) | GCP project id | `string` | `"florenciacomuzzi"` | no |
 | <a name="input_region"></a> [region](#input\_region) | GCP region | `string` | `"us-east1"` | no |
+| <a name="input_services_secondary_range_cidr"></a> [services\_secondary\_range\_cidr](#input\_services\_secondary\_range\_cidr) | The secondary range to use for services | `string` | `"10.30.0.0/16"` | no |
 | <a name="input_services_secondary_range_name"></a> [services\_secondary\_range\_name](#input\_services\_secondary\_range\_name) | The name of the secondary range to use for services | `string` | `"gke-services"` | no |
 | <a name="input_subnet_cidr"></a> [subnet\_cidr](#input\_subnet\_cidr) | The CIDR block for the subnet | `string` | n/a | yes |
 | <a name="input_subnet_name"></a> [subnet\_name](#input\_subnet\_name) | The name of the subnet | `string` | n/a | yes |

main.tf

@@ -5,8 +5,8 @@ module "vpc" {
   subnet_cidr                   = var.subnet_cidr
   subnet_name                   = var.subnet_name
   cluster_secondary_range_name  = var.cluster_secondary_range_name
-  cluster_secondary_range_cidr  = var.cluster_secondary_range_cidr
   services_secondary_range_name = var.services_secondary_range_name
+  cluster_secondary_range_cidr  = var.cluster_secondary_range_cidr
   services_secondary_range_cidr = var.services_secondary_range_cidr
 }
 

modules/private-k8s-cluster/variables.tf

@@ -36,17 +36,6 @@ variable "services_secondary_range_name" {
   description = "The name of the secondary range to use for services"
 }
 
-# variable "cluster_secondary_range_cidr" {
-#   type        = string
-#   description = "The secondary range to use for pods"
-# }
-#
-# variable "services_secondary_range_cidr" {
-#   type        = string
-#   default     = "10.30.0.0/16"
-#   description = "The secondary range to use for services"
-# }
-
 variable "cluster_name" {
   description = "The name of the GKE cluster"
   type        = string

modules/vpc/README.md

@@ -30,7 +30,6 @@ No modules.
 | <a name="input_cluster_secondary_range_cidr"></a> [cluster\_secondary\_range\_cidr](#input\_cluster\_secondary\_range\_cidr) | The secondary range to use for pods | `string` | `"10.20.0.0/16"` | no |
 | <a name="input_cluster_secondary_range_name"></a> [cluster\_secondary\_range\_name](#input\_cluster\_secondary\_range\_name) | The name of the secondary range to use for pods | `string` | `"gke-pods"` | no |
 | <a name="input_network_name"></a> [network\_name](#input\_network\_name) | The name of the VPC network | `string` | n/a | yes |
-| <a name="input_project_id"></a> [project\_id](#input\_project\_id) | GCP project id | `string` | n/a | yes |
 | <a name="input_region"></a> [region](#input\_region) | GCP region | `string` | `"us-east1"` | no |
 | <a name="input_services_secondary_range_cidr"></a> [services\_secondary\_range\_cidr](#input\_services\_secondary\_range\_cidr) | The name of the secondary range to use for services | `string` | `"10.30.0.0/16"` | no |
 | <a name="input_services_secondary_range_name"></a> [services\_secondary\_range\_name](#input\_services\_secondary\_range\_name) | The name of the secondary range to use for services | `string` | `"gke-services"` | no |

variables.tf

@@ -37,16 +37,16 @@ variable "services_secondary_range_name" {
   description = "The name of the secondary range to use for services"
 }
 
-# variable "cluster_secondary_range_cidr" {
-#   type        = string
-#   description = "The secondary range to use for pods"
-# }
-#
-# variable "services_secondary_range_cidr" {
-#   type        = string
-#   default     = "10.30.0.0/16"
-#   description = "The secondary range to use for services"
-# }
+variable "cluster_secondary_range_cidr" {
+  type        = string
+  description = "The secondary range to use for pods"
+}
+
+variable "services_secondary_range_cidr" {
+  type        = string
+  default     = "10.30.0.0/16"
+  description = "The secondary range to use for services"
+}
 
 variable "cluster_name" {
   description = "The name of the GKE cluster"

variables/dev.auto.tfvars

@@ -5,7 +5,9 @@ cluster_name                  = "florenciacomuzzi-cluster-dev"
 subnet_cidr                   = "10.0.0.0/24"
 subnet_name                   = "my-subnet"
 cluster_secondary_range_name  = "gke-pods"
+cluster_secondary_range_cidr  = "10.11.0.0/21"
 services_secondary_range_name = "gke-services"
+services_secondary_range_cidr = "10.12.0.0/21"
 master_ipv4_cidr_block        = "10.13.0.0/28"
 master_authorized_cidr_blocks = [
   {

variables/prod.auto.tfvars

@@ -5,7 +5,9 @@ cluster_name                  = "florenciacomuzzi-cluster-prod"
 subnet_cidr                   = "10.0.0.0/24"
 subnet_name                   = "my-subnet"
 cluster_secondary_range_name  = "gke-pods"
+cluster_secondary_range_cidr  = "10.11.0.0/21"
 services_secondary_range_name = "gke-services"
+services_secondary_range_cidr = "10.12.0.0/21"
 master_ipv4_cidr_block        = "10.13.0.0/28"
 master_authorized_cidr_blocks = [
   {