fix: removing gcloud_skip_download variable

Author: marko7460

README.md

@@ -131,7 +131,6 @@ Then perform the following commands on the root folder:
 | enable\_shielded\_nodes | Enable Shielded Nodes features on all nodes in this cluster | bool | `"true"` | no |
 | firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers | list(string) | `<list>` | no |
 | firewall\_priority | Priority rule for firewall rules | number | `"1000"` | no |
-| gcloud\_skip\_download | Whether to skip downloading gcloud (assumes gcloud is already available outside the module) | bool | `"true"` | no |
 | gcloud\_upgrade | Whether to upgrade gcloud at runtime | bool | `"false"` | no |
 | grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer role. | bool | `"false"` | no |
 | horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | bool | `"true"` | no |

autogen/main/cluster.tf.tmpl

@@ -538,7 +538,6 @@ module "gcloud_wait_for_cluster" {
   enabled = ! var.skip_provisioners
 
   upgrade       = var.gcloud_upgrade
-  skip_download = var.gcloud_skip_download
 
   create_cmd_entrypoint  = "${path.module}/scripts/wait-for-cluster.sh"
   create_cmd_body        = "${var.project_id} ${var.name}"

autogen/main/dns.tf.tmpl

@@ -27,7 +27,6 @@ module "gcloud_delete_default_kube_dns_configmap" {
   cluster_location = google_container_cluster.primary.location
   project_id       = var.project_id
   upgrade          = var.gcloud_upgrade
-  skip_download    = var.gcloud_skip_download
 
 
   kubectl_create_command  = "${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"

autogen/main/variables.tf.tmpl

@@ -548,12 +548,6 @@ variable "gcloud_upgrade" {
   default     = false
 }
 
-variable "gcloud_skip_download" {
-  type        = bool
-  description = "Whether to skip downloading gcloud (assumes gcloud is already available outside the module)"
-  default     = true
-}
-
 {% if beta_cluster %}
 variable "disable_default_snat" {
   type        = bool

cluster.tf

@@ -321,8 +321,7 @@ module "gcloud_wait_for_cluster" {
   version = "~> 2.0.2"
   enabled = ! var.skip_provisioners
 
-  upgrade       = var.gcloud_upgrade
-  skip_download = var.gcloud_skip_download
+  upgrade = var.gcloud_upgrade
 
   create_cmd_entrypoint  = "${path.module}/scripts/wait-for-cluster.sh"
   create_cmd_body        = "${var.project_id} ${var.name}"

dns.tf

@@ -27,7 +27,6 @@ module "gcloud_delete_default_kube_dns_configmap" {
   cluster_location = google_container_cluster.primary.location
   project_id       = var.project_id
   upgrade          = var.gcloud_upgrade
-  skip_download    = var.gcloud_skip_download
 
 
   kubectl_create_command  = "${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"

modules/beta-private-cluster-update-variant/README.md

@@ -175,7 +175,6 @@ Then perform the following commands on the root folder:
 | firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers | list(string) | `<list>` | no |
 | firewall\_priority | Priority rule for firewall rules | number | `"1000"` | no |
 | gce\_pd\_csi\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | bool | `"false"` | no |
-| gcloud\_skip\_download | Whether to skip downloading gcloud (assumes gcloud is already available outside the module) | bool | `"true"` | no |
 | gcloud\_upgrade | Whether to upgrade gcloud at runtime | bool | `"false"` | no |
 | grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer role. | bool | `"false"` | no |
 | horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | bool | `"true"` | no |

modules/beta-private-cluster-update-variant/cluster.tf

@@ -495,8 +495,7 @@ module "gcloud_wait_for_cluster" {
   version = "~> 2.0.2"
   enabled = ! var.skip_provisioners
 
-  upgrade       = var.gcloud_upgrade
-  skip_download = var.gcloud_skip_download
+  upgrade = var.gcloud_upgrade
 
   create_cmd_entrypoint  = "${path.module}/scripts/wait-for-cluster.sh"
   create_cmd_body        = "${var.project_id} ${var.name}"

modules/beta-private-cluster-update-variant/dns.tf

@@ -27,7 +27,6 @@ module "gcloud_delete_default_kube_dns_configmap" {
   cluster_location = google_container_cluster.primary.location
   project_id       = var.project_id
   upgrade          = var.gcloud_upgrade
-  skip_download    = var.gcloud_skip_download
 
 
   kubectl_create_command  = "${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"

modules/beta-private-cluster-update-variant/variables.tf

@@ -534,12 +534,6 @@ variable "gcloud_upgrade" {
   default     = false
 }
 
-variable "gcloud_skip_download" {
-  type        = bool
-  description = "Whether to skip downloading gcloud (assumes gcloud is already available outside the module)"
-  default     = true
-}
-
 variable "disable_default_snat" {
   type        = bool
   description = "Whether to disable the default SNAT to support the private use of public IP addresses"

modules/beta-private-cluster/README.md

@@ -153,7 +153,6 @@ Then perform the following commands on the root folder:
 | firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers | list(string) | `<list>` | no |
 | firewall\_priority | Priority rule for firewall rules | number | `"1000"` | no |
 | gce\_pd\_csi\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | bool | `"false"` | no |
-| gcloud\_skip\_download | Whether to skip downloading gcloud (assumes gcloud is already available outside the module) | bool | `"true"` | no |
 | gcloud\_upgrade | Whether to upgrade gcloud at runtime | bool | `"false"` | no |
 | grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer role. | bool | `"false"` | no |
 | horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | bool | `"true"` | no |

modules/beta-private-cluster/cluster.tf

@@ -422,8 +422,7 @@ module "gcloud_wait_for_cluster" {
   version = "~> 2.0.2"
   enabled = ! var.skip_provisioners
 
-  upgrade       = var.gcloud_upgrade
-  skip_download = var.gcloud_skip_download
+  upgrade = var.gcloud_upgrade
 
   create_cmd_entrypoint  = "${path.module}/scripts/wait-for-cluster.sh"
   create_cmd_body        = "${var.project_id} ${var.name}"

modules/beta-private-cluster/dns.tf

@@ -27,7 +27,6 @@ module "gcloud_delete_default_kube_dns_configmap" {
   cluster_location = google_container_cluster.primary.location
   project_id       = var.project_id
   upgrade          = var.gcloud_upgrade
-  skip_download    = var.gcloud_skip_download
 
 
   kubectl_create_command  = "${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"

modules/beta-private-cluster/variables.tf

@@ -534,12 +534,6 @@ variable "gcloud_upgrade" {
   default     = false
 }
 
-variable "gcloud_skip_download" {
-  type        = bool
-  description = "Whether to skip downloading gcloud (assumes gcloud is already available outside the module)"
-  default     = true
-}
-
 variable "disable_default_snat" {
   type        = bool
   description = "Whether to disable the default SNAT to support the private use of public IP addresses"

modules/beta-public-cluster-update-variant/README.md

@@ -166,7 +166,6 @@ Then perform the following commands on the root folder:
 | firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers | list(string) | `<list>` | no |
 | firewall\_priority | Priority rule for firewall rules | number | `"1000"` | no |
 | gce\_pd\_csi\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | bool | `"false"` | no |
-| gcloud\_skip\_download | Whether to skip downloading gcloud (assumes gcloud is already available outside the module) | bool | `"true"` | no |
 | gcloud\_upgrade | Whether to upgrade gcloud at runtime | bool | `"false"` | no |
 | grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer role. | bool | `"false"` | no |
 | horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | bool | `"true"` | no |

modules/beta-public-cluster-update-variant/cluster.tf

@@ -476,8 +476,7 @@ module "gcloud_wait_for_cluster" {
   version = "~> 2.0.2"
   enabled = ! var.skip_provisioners
 
-  upgrade       = var.gcloud_upgrade
-  skip_download = var.gcloud_skip_download
+  upgrade = var.gcloud_upgrade
 
   create_cmd_entrypoint  = "${path.module}/scripts/wait-for-cluster.sh"
   create_cmd_body        = "${var.project_id} ${var.name}"

modules/beta-public-cluster-update-variant/dns.tf

@@ -27,7 +27,6 @@ module "gcloud_delete_default_kube_dns_configmap" {
   cluster_location = google_container_cluster.primary.location
   project_id       = var.project_id
   upgrade          = var.gcloud_upgrade
-  skip_download    = var.gcloud_skip_download
 
 
   kubectl_create_command  = "${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"

modules/beta-public-cluster-update-variant/variables.tf

@@ -503,12 +503,6 @@ variable "gcloud_upgrade" {
   default     = false
 }
 
-variable "gcloud_skip_download" {
-  type        = bool
-  description = "Whether to skip downloading gcloud (assumes gcloud is already available outside the module)"
-  default     = true
-}
-
 variable "disable_default_snat" {
   type        = bool
   description = "Whether to disable the default SNAT to support the private use of public IP addresses"

modules/beta-public-cluster/README.md

@@ -144,7 +144,6 @@ Then perform the following commands on the root folder:
 | firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers | list(string) | `<list>` | no |
 | firewall\_priority | Priority rule for firewall rules | number | `"1000"` | no |
 | gce\_pd\_csi\_driver | (Beta) Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. | bool | `"false"` | no |
-| gcloud\_skip\_download | Whether to skip downloading gcloud (assumes gcloud is already available outside the module) | bool | `"true"` | no |
 | gcloud\_upgrade | Whether to upgrade gcloud at runtime | bool | `"false"` | no |
 | grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer role. | bool | `"false"` | no |
 | horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | bool | `"true"` | no |

modules/beta-public-cluster/cluster.tf

@@ -403,8 +403,7 @@ module "gcloud_wait_for_cluster" {
   version = "~> 2.0.2"
   enabled = ! var.skip_provisioners
 
-  upgrade       = var.gcloud_upgrade
-  skip_download = var.gcloud_skip_download
+  upgrade = var.gcloud_upgrade
 
   create_cmd_entrypoint  = "${path.module}/scripts/wait-for-cluster.sh"
   create_cmd_body        = "${var.project_id} ${var.name}"

modules/beta-public-cluster/dns.tf

@@ -27,7 +27,6 @@ module "gcloud_delete_default_kube_dns_configmap" {
   cluster_location = google_container_cluster.primary.location
   project_id       = var.project_id
   upgrade          = var.gcloud_upgrade
-  skip_download    = var.gcloud_skip_download
 
 
   kubectl_create_command  = "${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"

modules/beta-public-cluster/variables.tf

@@ -503,12 +503,6 @@ variable "gcloud_upgrade" {
   default     = false
 }
 
-variable "gcloud_skip_download" {
-  type        = bool
-  description = "Whether to skip downloading gcloud (assumes gcloud is already available outside the module)"
-  default     = true
-}
-
 variable "disable_default_snat" {
   type        = bool
   description = "Whether to disable the default SNAT to support the private use of public IP addresses"

modules/private-cluster-update-variant/README.md

@@ -162,7 +162,6 @@ Then perform the following commands on the root folder:
 | enable\_shielded\_nodes | Enable Shielded Nodes features on all nodes in this cluster | bool | `"true"` | no |
 | firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers | list(string) | `<list>` | no |
 | firewall\_priority | Priority rule for firewall rules | number | `"1000"` | no |
-| gcloud\_skip\_download | Whether to skip downloading gcloud (assumes gcloud is already available outside the module) | bool | `"true"` | no |
 | gcloud\_upgrade | Whether to upgrade gcloud at runtime | bool | `"false"` | no |
 | grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer role. | bool | `"false"` | no |
 | horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | bool | `"true"` | no |

modules/private-cluster-update-variant/cluster.tf

@@ -407,8 +407,7 @@ module "gcloud_wait_for_cluster" {
   version = "~> 2.0.2"
   enabled = ! var.skip_provisioners
 
-  upgrade       = var.gcloud_upgrade
-  skip_download = var.gcloud_skip_download
+  upgrade = var.gcloud_upgrade
 
   create_cmd_entrypoint  = "${path.module}/scripts/wait-for-cluster.sh"
   create_cmd_body        = "${var.project_id} ${var.name}"

modules/private-cluster-update-variant/dns.tf

@@ -27,7 +27,6 @@ module "gcloud_delete_default_kube_dns_configmap" {
   cluster_location = google_container_cluster.primary.location
   project_id       = var.project_id
   upgrade          = var.gcloud_upgrade
-  skip_download    = var.gcloud_skip_download
 
 
   kubectl_create_command  = "${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"

modules/private-cluster-update-variant/variables.tf

@@ -437,9 +437,3 @@ variable "gcloud_upgrade" {
   default     = false
 }
 
-variable "gcloud_skip_download" {
-  type        = bool
-  description = "Whether to skip downloading gcloud (assumes gcloud is already available outside the module)"
-  default     = true
-}
-

modules/private-cluster/README.md

@@ -140,7 +140,6 @@ Then perform the following commands on the root folder:
 | enable\_shielded\_nodes | Enable Shielded Nodes features on all nodes in this cluster | bool | `"true"` | no |
 | firewall\_inbound\_ports | List of TCP ports for admission/webhook controllers | list(string) | `<list>` | no |
 | firewall\_priority | Priority rule for firewall rules | number | `"1000"` | no |
-| gcloud\_skip\_download | Whether to skip downloading gcloud (assumes gcloud is already available outside the module) | bool | `"true"` | no |
 | gcloud\_upgrade | Whether to upgrade gcloud at runtime | bool | `"false"` | no |
 | grant\_registry\_access | Grants created cluster-specific service account storage.objectViewer role. | bool | `"false"` | no |
 | horizontal\_pod\_autoscaling | Enable horizontal pod autoscaling addon | bool | `"true"` | no |

modules/private-cluster/cluster.tf

@@ -334,8 +334,7 @@ module "gcloud_wait_for_cluster" {
   version = "~> 2.0.2"
   enabled = ! var.skip_provisioners
 
-  upgrade       = var.gcloud_upgrade
-  skip_download = var.gcloud_skip_download
+  upgrade = var.gcloud_upgrade
 
   create_cmd_entrypoint  = "${path.module}/scripts/wait-for-cluster.sh"
   create_cmd_body        = "${var.project_id} ${var.name}"

modules/private-cluster/dns.tf

@@ -27,7 +27,6 @@ module "gcloud_delete_default_kube_dns_configmap" {
   cluster_location = google_container_cluster.primary.location
   project_id       = var.project_id
   upgrade          = var.gcloud_upgrade
-  skip_download    = var.gcloud_skip_download
 
 
   kubectl_create_command  = "${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"

modules/private-cluster/variables.tf

@@ -437,9 +437,3 @@ variable "gcloud_upgrade" {
   default     = false
 }
 
-variable "gcloud_skip_download" {
-  type        = bool
-  description = "Whether to skip downloading gcloud (assumes gcloud is already available outside the module)"
-  default     = true
-}
-

variables.tf

@@ -413,9 +413,3 @@ variable "gcloud_upgrade" {
   default     = false
 }
 
-variable "gcloud_skip_download" {
-  type        = bool
-  description = "Whether to skip downloading gcloud (assumes gcloud is already available outside the module)"
-  default     = true
-}
-