default cluster_ipv4_cidr to null, relax version constraints

bharathkkb · bharathkkb · commit 17e3e29f33d0 · 2019-12-27T11:11:38.000-06:00
diff --git a/README.md b/README.md
@@ -115,6 +115,7 @@ Then perform the following commands on the root folder:
 |------|-------------|:----:|:-----:|:-----:|
 | basic\_auth\_password | The password to be used with Basic Authentication. | string | `""` | no |
 | basic\_auth\_username | The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration. | string | `""` | no |
+| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `"null"` | no |
 | cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | map(string) | `<map>` | no |
 | configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | string | `"false"` | no |
 | create\_service\_account | Defines if service account specified to run nodes should be created. | bool | `"true"` | no |
diff --git a/autogen/cluster.tf.tmpl b/autogen/cluster.tf.tmpl
@@ -30,9 +30,11 @@ resource "google_container_cluster" "primary" {
   description     = var.description
   project         = var.project_id
   resource_labels = var.cluster_resource_labels
-  location        = local.location
-  node_locations  = local.node_locations
-  network         = data.google_compute_network.gke_network.self_link
+
+  location          = local.location
+  node_locations    = local.node_locations
+  cluster_ipv4_cidr = var.cluster_ipv4_cidr
+  network           = data.google_compute_network.gke_network.self_link
 
   dynamic "network_policy" {
     for_each = local.cluster_network_policy
diff --git a/autogen/variables.tf.tmpl b/autogen/variables.tf.tmpl
@@ -317,6 +317,11 @@ variable "issue_client_certificate" {
   default     = false
 }
 
+variable "cluster_ipv4_cidr" {
+  default     = null
+  description = "The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR."
+}
+
 variable "cluster_resource_labels" {
   type        = map(string)
   description = "The GCE resource labels (a map of key/value pairs) to be applied to the cluster"
diff --git a/autogen/versions.tf.tmpl b/autogen/versions.tf.tmpl
@@ -19,9 +19,9 @@ terraform {
 
   required_providers {
 {% if beta_cluster %}
-    google-beta = "~> 3.3.0"
+    google-beta = ">= 2.18, <4.0.0"
 {% else %}
-    google = "~> 3.3.0"
+    google = ">= 2.18, <4.0.0"
 {% endif %}
   }
 }
diff --git a/cluster.tf b/cluster.tf
@@ -26,9 +26,11 @@ resource "google_container_cluster" "primary" {
   description     = var.description
   project         = var.project_id
   resource_labels = var.cluster_resource_labels
-  location        = local.location
-  node_locations  = local.node_locations
-  network         = data.google_compute_network.gke_network.self_link
+
+  location          = local.location
+  node_locations    = local.node_locations
+  cluster_ipv4_cidr = var.cluster_ipv4_cidr
+  network           = data.google_compute_network.gke_network.self_link
 
   dynamic "network_policy" {
     for_each = local.cluster_network_policy
diff --git a/modules/beta-private-cluster-update-variant/README.md b/modules/beta-private-cluster-update-variant/README.md
@@ -137,6 +137,7 @@ Then perform the following commands on the root folder:
 | basic\_auth\_username | The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration. | string | `""` | no |
 | cloudrun | (Beta) Enable CloudRun addon | string | `"false"` | no |
 | cluster\_autoscaling | Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling) | object | `<map>` | no |
+| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `"null"` | no |
 | cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | map(string) | `<map>` | no |
 | configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | string | `"false"` | no |
 | create\_service\_account | Defines if service account specified to run nodes should be created. | bool | `"true"` | no |
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -26,9 +26,11 @@ resource "google_container_cluster" "primary" {
   description     = var.description
   project         = var.project_id
   resource_labels = var.cluster_resource_labels
-  location        = local.location
-  node_locations  = local.node_locations
-  network         = data.google_compute_network.gke_network.self_link
+
+  location          = local.location
+  node_locations    = local.node_locations
+  cluster_ipv4_cidr = var.cluster_ipv4_cidr
+  network           = data.google_compute_network.gke_network.self_link
 
   dynamic "network_policy" {
     for_each = local.cluster_network_policy
diff --git a/modules/beta-private-cluster-update-variant/variables.tf b/modules/beta-private-cluster-update-variant/variables.tf
@@ -315,6 +315,11 @@ variable "issue_client_certificate" {
   default     = false
 }
 
+variable "cluster_ipv4_cidr" {
+  default     = null
+  description = "The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR."
+}
+
 variable "cluster_resource_labels" {
   type        = map(string)
   description = "The GCE resource labels (a map of key/value pairs) to be applied to the cluster"
diff --git a/modules/beta-private-cluster-update-variant/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    google-beta = "~> 3.3.0"
+    google-beta = ">= 2.18, <4.0.0"
   }
 }
diff --git a/modules/beta-private-cluster/README.md b/modules/beta-private-cluster/README.md
@@ -137,6 +137,7 @@ Then perform the following commands on the root folder:
 | basic\_auth\_username | The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration. | string | `""` | no |
 | cloudrun | (Beta) Enable CloudRun addon | string | `"false"` | no |
 | cluster\_autoscaling | Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling) | object | `<map>` | no |
+| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `"null"` | no |
 | cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | map(string) | `<map>` | no |
 | configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | string | `"false"` | no |
 | create\_service\_account | Defines if service account specified to run nodes should be created. | bool | `"true"` | no |
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -26,9 +26,11 @@ resource "google_container_cluster" "primary" {
   description     = var.description
   project         = var.project_id
   resource_labels = var.cluster_resource_labels
-  location        = local.location
-  node_locations  = local.node_locations
-  network         = data.google_compute_network.gke_network.self_link
+
+  location          = local.location
+  node_locations    = local.node_locations
+  cluster_ipv4_cidr = var.cluster_ipv4_cidr
+  network           = data.google_compute_network.gke_network.self_link
 
   dynamic "network_policy" {
     for_each = local.cluster_network_policy
diff --git a/modules/beta-private-cluster/variables.tf b/modules/beta-private-cluster/variables.tf
@@ -315,6 +315,11 @@ variable "issue_client_certificate" {
   default     = false
 }
 
+variable "cluster_ipv4_cidr" {
+  default     = null
+  description = "The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR."
+}
+
 variable "cluster_resource_labels" {
   type        = map(string)
   description = "The GCE resource labels (a map of key/value pairs) to be applied to the cluster"
diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    google-beta = "~> 3.3.0"
+    google-beta = ">= 2.18, <4.0.0"
   }
 }
diff --git a/modules/beta-public-cluster/README.md b/modules/beta-public-cluster/README.md
@@ -121,6 +121,7 @@ Then perform the following commands on the root folder:
 | basic\_auth\_username | The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration. | string | `""` | no |
 | cloudrun | (Beta) Enable CloudRun addon | string | `"false"` | no |
 | cluster\_autoscaling | Cluster autoscaling configuration. See [more details](https://cloud.google.com/kubernetes-engine/docs/reference/rest/v1beta1/projects.locations.clusters#clusterautoscaling) | object | `<map>` | no |
+| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `"null"` | no |
 | cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | map(string) | `<map>` | no |
 | configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | string | `"false"` | no |
 | create\_service\_account | Defines if service account specified to run nodes should be created. | bool | `"true"` | no |
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -26,9 +26,11 @@ resource "google_container_cluster" "primary" {
   description     = var.description
   project         = var.project_id
   resource_labels = var.cluster_resource_labels
-  location        = local.location
-  node_locations  = local.node_locations
-  network         = data.google_compute_network.gke_network.self_link
+
+  location          = local.location
+  node_locations    = local.node_locations
+  cluster_ipv4_cidr = var.cluster_ipv4_cidr
+  network           = data.google_compute_network.gke_network.self_link
 
   dynamic "network_policy" {
     for_each = local.cluster_network_policy
diff --git a/modules/beta-public-cluster/variables.tf b/modules/beta-public-cluster/variables.tf
@@ -315,6 +315,11 @@ variable "issue_client_certificate" {
   default     = false
 }
 
+variable "cluster_ipv4_cidr" {
+  default     = null
+  description = "The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR."
+}
+
 variable "cluster_resource_labels" {
   type        = map(string)
   description = "The GCE resource labels (a map of key/value pairs) to be applied to the cluster"
diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    google-beta = "~> 3.3.0"
+    google-beta = ">= 2.18, <4.0.0"
   }
 }
diff --git a/modules/private-cluster-update-variant/README.md b/modules/private-cluster-update-variant/README.md
@@ -131,6 +131,7 @@ Then perform the following commands on the root folder:
 |------|-------------|:----:|:-----:|:-----:|
 | basic\_auth\_password | The password to be used with Basic Authentication. | string | `""` | no |
 | basic\_auth\_username | The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration. | string | `""` | no |
+| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `"null"` | no |
 | cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | map(string) | `<map>` | no |
 | configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | string | `"false"` | no |
 | create\_service\_account | Defines if service account specified to run nodes should be created. | bool | `"true"` | no |
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -26,9 +26,11 @@ resource "google_container_cluster" "primary" {
   description     = var.description
   project         = var.project_id
   resource_labels = var.cluster_resource_labels
-  location        = local.location
-  node_locations  = local.node_locations
-  network         = data.google_compute_network.gke_network.self_link
+
+  location          = local.location
+  node_locations    = local.node_locations
+  cluster_ipv4_cidr = var.cluster_ipv4_cidr
+  network           = data.google_compute_network.gke_network.self_link
 
   dynamic "network_policy" {
     for_each = local.cluster_network_policy
diff --git a/modules/private-cluster-update-variant/variables.tf b/modules/private-cluster-update-variant/variables.tf
@@ -285,6 +285,11 @@ variable "issue_client_certificate" {
   default     = false
 }
 
+variable "cluster_ipv4_cidr" {
+  default     = null
+  description = "The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR."
+}
+
 variable "cluster_resource_labels" {
   type        = map(string)
   description = "The GCE resource labels (a map of key/value pairs) to be applied to the cluster"
diff --git a/modules/private-cluster-update-variant/versions.tf b/modules/private-cluster-update-variant/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    google = "~> 3.3.0"
+    google = ">= 2.18, <4.0.0"
   }
 }
diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md
@@ -131,6 +131,7 @@ Then perform the following commands on the root folder:
 |------|-------------|:----:|:-----:|:-----:|
 | basic\_auth\_password | The password to be used with Basic Authentication. | string | `""` | no |
 | basic\_auth\_username | The username to be used with Basic Authentication. An empty value will disable Basic Authentication, which is the recommended configuration. | string | `""` | no |
+| cluster\_ipv4\_cidr | The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR. | string | `"null"` | no |
 | cluster\_resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster | map(string) | `<map>` | no |
 | configure\_ip\_masq | Enables the installation of ip masquerading, which is usually no longer required when using aliasied IP addresses. IP masquerading uses a kubectl call, so when you have a private cluster, you will need access to the API server. | string | `"false"` | no |
 | create\_service\_account | Defines if service account specified to run nodes should be created. | bool | `"true"` | no |
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -26,9 +26,11 @@ resource "google_container_cluster" "primary" {
   description     = var.description
   project         = var.project_id
   resource_labels = var.cluster_resource_labels
-  location        = local.location
-  node_locations  = local.node_locations
-  network         = data.google_compute_network.gke_network.self_link
+
+  location          = local.location
+  node_locations    = local.node_locations
+  cluster_ipv4_cidr = var.cluster_ipv4_cidr
+  network           = data.google_compute_network.gke_network.self_link
 
   dynamic "network_policy" {
     for_each = local.cluster_network_policy
diff --git a/modules/private-cluster/variables.tf b/modules/private-cluster/variables.tf
@@ -285,6 +285,11 @@ variable "issue_client_certificate" {
   default     = false
 }
 
+variable "cluster_ipv4_cidr" {
+  default     = null
+  description = "The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR."
+}
+
 variable "cluster_resource_labels" {
   type        = map(string)
   description = "The GCE resource labels (a map of key/value pairs) to be applied to the cluster"
diff --git a/modules/private-cluster/versions.tf b/modules/private-cluster/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    google = "~> 3.3.0"
+    google = ">= 2.18, <4.0.0"
   }
 }
diff --git a/variables.tf b/variables.tf
@@ -285,6 +285,11 @@ variable "issue_client_certificate" {
   default     = false
 }
 
+variable "cluster_ipv4_cidr" {
+  default     = null
+  description = "The IP address range of the kubernetes pods in this cluster. Default is an automatically assigned CIDR."
+}
+
 variable "cluster_resource_labels" {
   type        = map(string)
   description = "The GCE resource labels (a map of key/value pairs) to be applied to the cluster"
diff --git a/versions.tf b/versions.tf
@@ -18,6 +18,6 @@ terraform {
   required_version = ">= 0.12"
 
   required_providers {
-    google = "~> 3.3.0"
+    google = ">= 2.18, <4.0.0"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ terraform {`
`19`	`19`
`20`	`20`	`required_providers {`
`21`	`21`	`{% if beta_cluster %}`
`22`		`- google-beta = "~> 3.3.0"`
	`22`	`+ google-beta = ">= 2.18, <4.0.0"`
`23`	`23`	`{% else %}`
`24`		`- google = "~> 3.3.0"`
	`24`	`+ google = ">= 2.18, <4.0.0"`
`25`	`25`	`{% endif %}`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ terraform {`
`18`	`18`	`required_version = ">= 0.12"`
`19`	`19`
`20`	`20`	`required_providers {`
`21`		`- google-beta = "~> 3.3.0"`
	`21`	`+ google-beta = ">= 2.18, <4.0.0"`
`22`	`22`	`}`
`23`	`23`	`}`