fix: removing gcloud_skip_download variable (#712)

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 |
@@ -252,6 +251,9 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
 #### Terraform and Plugins
 - [Terraform](https://www.terraform.io/downloads.html) 0.12
 - [Terraform Provider for GCP][terraform-provider-google] v3.41
+#### gcloud
+Some submodules use the [terraform-google-gcloud](https://github.com/terraform-google-modules/terraform-google-gcloud) module. By default, this module assumes you already have gcloud installed in your $PATH.
+See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.
 
 ### Configure a Service Account
 In order to execute this module you must have a Service Account with the

autogen/main/README.md

@@ -213,6 +213,9 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
 {% else %}
 - [Terraform Provider for GCP][terraform-provider-google] v3.41
 {% endif %}
+#### gcloud
+Some submodules use the [terraform-google-gcloud](https://github.com/terraform-google-modules/terraform-google-gcloud) module. By default, this module assumes you already have gcloud installed in your $PATH.
+See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.
 
 ### Configure a Service Account
 In order to execute this module you must have a Service Account with the

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/acm/README.md

@@ -57,7 +57,6 @@ By default, this module will attempt to download the ACM operator from Google di
 | project\_id | GCP project_id used to reach cluster. | string | n/a | yes |
 | secret\_type | git authentication secret type, is passed through to ConfigManagement spec.git.secretType. Overriden to value 'ssh' if `create_ssh_key` is true | string | `"ssh"` | no |
 | service\_account\_key\_file | Path to service account key file to auth as for running `gcloud container clusters get-credentials`. | string | `""` | no |
-| skip\_gcloud\_download | Whether to skip downloading gcloud (assumes gcloud and kubectl already available outside the module) | bool | `"true"` | no |
 | source\_format | Configures a non-hierarchical repo if set to 'unstructured'. Uses [ACM defaults](https://cloud.google.com/anthos-config-management/docs/how-to/installing#configuring-config-management-operator) when unset. | string | `""` | no |
 | ssh\_auth\_key | Key for Git authentication. Overrides 'create_ssh_key' variable. Can be set using 'file(path/to/file)'-function. | string | `"null"` | no |
 | sync\_branch | ACM repo Git branch. If un-set, uses Config Management default. | string | `""` | no |

modules/acm/main.tf

@@ -31,7 +31,6 @@ module "acm_operator" {
   ssh_auth_key             = var.ssh_auth_key
   enable_policy_controller = var.enable_policy_controller
   install_template_library = var.install_template_library
-  skip_gcloud_download     = var.skip_gcloud_download
   source_format            = var.source_format
   hierarchy_controller     = var.hierarchy_controller
   enable_log_denies        = var.enable_log_denies

modules/acm/variables.tf

@@ -87,12 +87,6 @@ variable "install_template_library" {
   default     = true
 }
 
-variable "skip_gcloud_download" {
-  description = "Whether to skip downloading gcloud (assumes gcloud and kubectl already available outside the module)"
-  type        = bool
-  default     = true
-}
-
 variable "source_format" {
   description = "Configures a non-hierarchical repo if set to 'unstructured'. Uses [ACM defaults](https://cloud.google.com/anthos-config-management/docs/how-to/installing#configuring-config-management-operator) when unset."
   type        = string

modules/asm/README.md

@@ -45,7 +45,6 @@ To deploy this config:
 | location | The location (zone or region) this cluster has been created in. | string | n/a | yes |
 | project\_id | The project in which the resource belongs. | string | n/a | yes |
 | service\_account\_key\_file | Path to service account key file to auth as for running `gcloud container clusters get-credentials`. | string | `""` | no |
-| skip\_gcloud\_download | Whether to skip downloading gcloud (assumes gcloud and kubectl already available outside the module) | bool | `"true"` | no |
 
 ## Outputs
 

modules/asm/main.tf

@@ -25,7 +25,6 @@ module "asm_install" {
   module_depends_on = [var.cluster_endpoint]
 
   gcloud_sdk_version       = var.gcloud_sdk_version
-  skip_download            = var.skip_gcloud_download
   upgrade                  = true
   additional_components    = ["kubectl", "kpt", "beta", "kustomize"]
   cluster_name             = var.cluster_name

modules/asm/variables.tf

@@ -34,12 +34,6 @@ variable "location" {
   type        = string
 }
 
-variable "skip_gcloud_download" {
-  description = "Whether to skip downloading gcloud (assumes gcloud and kubectl already available outside the module)"
-  type        = bool
-  default     = true
-}
-
 variable "gcloud_sdk_version" {
   description = "The gcloud sdk version to use. Minimum required version is 293.0.0"
   type        = string

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 |
@@ -316,6 +315,9 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
 #### Terraform and Plugins
 - [Terraform](https://www.terraform.io/downloads.html) 0.12
 - [Terraform Provider for GCP Beta][terraform-provider-google-beta] v3.41
+#### gcloud
+Some submodules use the [terraform-google-gcloud](https://github.com/terraform-google-modules/terraform-google-gcloud) module. By default, this module assumes you already have gcloud installed in your $PATH.
+See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.
 
 ### Configure a Service Account
 In order to execute this module you must have a Service Account with the

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 |
@@ -294,6 +293,9 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
 #### Terraform and Plugins
 - [Terraform](https://www.terraform.io/downloads.html) 0.12
 - [Terraform Provider for GCP Beta][terraform-provider-google-beta] v3.41
+#### gcloud
+Some submodules use the [terraform-google-gcloud](https://github.com/terraform-google-modules/terraform-google-gcloud) module. By default, this module assumes you already have gcloud installed in your $PATH.
+See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.
 
 ### Configure a Service Account
 In order to execute this module you must have a Service Account with the

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 |
@@ -303,6 +302,9 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
 #### Terraform and Plugins
 - [Terraform](https://www.terraform.io/downloads.html) 0.12
 - [Terraform Provider for GCP Beta][terraform-provider-google-beta] v3.41
+#### gcloud
+Some submodules use the [terraform-google-gcloud](https://github.com/terraform-google-modules/terraform-google-gcloud) module. By default, this module assumes you already have gcloud installed in your $PATH.
+See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.
 
 ### Configure a Service Account
 In order to execute this module you must have a Service Account with the

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 |
@@ -281,6 +280,9 @@ The [project factory](https://github.com/terraform-google-modules/terraform-goog
 #### Terraform and Plugins
 - [Terraform](https://www.terraform.io/downloads.html) 0.12
 - [Terraform Provider for GCP Beta][terraform-provider-google-beta] v3.41
+#### gcloud
+Some submodules use the [terraform-google-gcloud](https://github.com/terraform-google-modules/terraform-google-gcloud) module. By default, this module assumes you already have gcloud installed in your $PATH.
+See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.
 
 ### Configure a Service Account
 In order to execute this module you must have a Service Account with the

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/config-sync/README.md

@@ -56,7 +56,6 @@ To deploy this config:
 | policy\_dir | Subfolder containing configs in ACM Git repo. If un-set, uses Config Management default. | string | `""` | no |
 | project\_id | GCP project_id used to reach cluster. | string | n/a | yes |
 | secret\_type | credential secret type, passed through to ConfigManagement spec.git.secretType. Overriden to value 'ssh' if `create_ssh_key` is true | string | n/a | yes |
-| skip\_gcloud\_download | Whether to skip downloading gcloud (assumes gcloud and kubectl already available outside the module) | bool | `"true"` | no |
 | source\_format | Configures a non-hierarchical repo if set to 'unstructured'. Uses [Config Sync defaults](https://cloud.google.com/kubernetes-engine/docs/add-on/config-sync/how-to/installing#configuring-config-management-operator) when unset. | string | `""` | no |
 | ssh\_auth\_key | Key for Git authentication. Overrides 'create_ssh_key' variable. Can be set using 'file(path/to/file)'-function. | string | `"null"` | no |
 | sync\_branch | ACM repo Git branch. If un-set, uses Config Management default. | string | `""` | no |

modules/config-sync/main.tf

@@ -29,7 +29,6 @@ module "configsync_operator" {
   create_ssh_key       = var.create_ssh_key
   secret_type          = var.secret_type
   ssh_auth_key         = var.ssh_auth_key
-  skip_gcloud_download = var.skip_gcloud_download
   source_format        = var.source_format
   hierarchy_controller = var.hierarchy_controller