Skip to content

Commit 5e86276

Browse files
committed
fix: removing gcloud_skip_download variable
1 parent 2cb4fae commit 5e86276

File tree

46 files changed

+42
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+42
-124
lines changed

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ The resources/services/activations/deletions that this module will create/trigge
1010

1111
Sub modules are provided for creating private clusters, beta private clusters, and beta public clusters as well. Beta sub modules allow for the use of various GKE beta features. See the modules directory for the various sub modules.
1212

13+
NOTE:<br>
14+
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.
15+
See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.
16+
1317
## Compatibility
1418

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

autogen/main/README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ The resources/services/activations/deletions that this module will create/trigge
1111

1212
Sub modules are provided for creating private clusters, beta private clusters, and beta public clusters as well. Beta sub modules allow for the use of various GKE beta features. See the modules directory for the various sub modules.
1313

14+
NOTE:<br>
15+
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.
16+
See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.
17+
1418
{% if private_cluster %}
1519
## Private Cluster Details
1620
For details on configuring private clusters with this module, check the [troubleshooting guide](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/blob/master/docs/private_clusters.md).

autogen/main/cluster.tf.tmpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,6 @@ module "gcloud_wait_for_cluster" {
538538
enabled = ! var.skip_provisioners
539539

540540
upgrade = var.gcloud_upgrade
541-
skip_download = var.gcloud_skip_download
542541

543542
create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
544543
create_cmd_body = "${var.project_id} ${var.name}"

autogen/main/dns.tf.tmpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ module "gcloud_delete_default_kube_dns_configmap" {
2727
cluster_location = google_container_cluster.primary.location
2828
project_id = var.project_id
2929
upgrade = var.gcloud_upgrade
30-
skip_download = var.gcloud_skip_download
3130

3231

3332
kubectl_create_command = "${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"

autogen/main/variables.tf.tmpl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -548,12 +548,6 @@ variable "gcloud_upgrade" {
548548
default = false
549549
}
550550

551-
variable "gcloud_skip_download" {
552-
type = bool
553-
description = "Whether to skip downloading gcloud (assumes gcloud is already available outside the module)"
554-
default = true
555-
}
556-
557551
{% if beta_cluster %}
558552
variable "disable_default_snat" {
559553
type = bool

cluster.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -321,8 +321,7 @@ module "gcloud_wait_for_cluster" {
321321
version = "~> 2.0.2"
322322
enabled = ! var.skip_provisioners
323323

324-
upgrade = var.gcloud_upgrade
325-
skip_download = var.gcloud_skip_download
324+
upgrade = var.gcloud_upgrade
326325

327326
create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
328327
create_cmd_body = "${var.project_id} ${var.name}"

dns.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ module "gcloud_delete_default_kube_dns_configmap" {
2727
cluster_location = google_container_cluster.primary.location
2828
project_id = var.project_id
2929
upgrade = var.gcloud_upgrade
30-
skip_download = var.gcloud_skip_download
3130

3231

3332
kubectl_create_command = "${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"

modules/acm/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ By default, this module will attempt to download the ACM operator from Google di
5757
| project\_id | GCP project_id used to reach cluster. | string | n/a | yes |
5858
| 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 |
5959
| service\_account\_key\_file | Path to service account key file to auth as for running `gcloud container clusters get-credentials`. | string | `""` | no |
60-
| skip\_gcloud\_download | Whether to skip downloading gcloud (assumes gcloud and kubectl already available outside the module) | bool | `"true"` | no |
6160
| 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 |
6261
| ssh\_auth\_key | Key for Git authentication. Overrides 'create_ssh_key' variable. Can be set using 'file(path/to/file)'-function. | string | `"null"` | no |
6362
| sync\_branch | ACM repo Git branch. If un-set, uses Config Management default. | string | `""` | no |

modules/acm/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ module "acm_operator" {
3131
ssh_auth_key = var.ssh_auth_key
3232
enable_policy_controller = var.enable_policy_controller
3333
install_template_library = var.install_template_library
34-
skip_gcloud_download = var.skip_gcloud_download
3534
source_format = var.source_format
3635
hierarchy_controller = var.hierarchy_controller
3736
enable_log_denies = var.enable_log_denies

modules/acm/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,6 @@ variable "install_template_library" {
8787
default = true
8888
}
8989

90-
variable "skip_gcloud_download" {
91-
description = "Whether to skip downloading gcloud (assumes gcloud and kubectl already available outside the module)"
92-
type = bool
93-
default = true
94-
}
95-
9690
variable "source_format" {
9791
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."
9892
type = string

modules/asm/README.md

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

5049
## Outputs
5150

modules/asm/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ module "asm_install" {
2525
module_depends_on = [var.cluster_endpoint]
2626

2727
gcloud_sdk_version = var.gcloud_sdk_version
28-
skip_download = var.skip_gcloud_download
2928
upgrade = true
3029
additional_components = ["kubectl", "kpt", "beta", "kustomize"]
3130
cluster_name = var.cluster_name

modules/asm/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ variable "location" {
3434
type = string
3535
}
3636

37-
variable "skip_gcloud_download" {
38-
description = "Whether to skip downloading gcloud (assumes gcloud and kubectl already available outside the module)"
39-
type = bool
40-
default = true
41-
}
42-
4337
variable "gcloud_sdk_version" {
4438
description = "The gcloud sdk version to use. Minimum required version is 293.0.0"
4539
type = string

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ The resources/services/activations/deletions that this module will create/trigge
1010

1111
Sub modules are provided for creating private clusters, beta private clusters, and beta public clusters as well. Beta sub modules allow for the use of various GKE beta features. See the modules directory for the various sub modules.
1212

13+
NOTE:<br>
14+
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.
15+
See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.
16+
1317
## Private Cluster Details
1418
For details on configuring private clusters with this module, check the [troubleshooting guide](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/blob/master/docs/private_clusters.md).
1519

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

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,7 @@ module "gcloud_wait_for_cluster" {
495495
version = "~> 2.0.2"
496496
enabled = ! var.skip_provisioners
497497

498-
upgrade = var.gcloud_upgrade
499-
skip_download = var.gcloud_skip_download
498+
upgrade = var.gcloud_upgrade
500499

501500
create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
502501
create_cmd_body = "${var.project_id} ${var.name}"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ module "gcloud_delete_default_kube_dns_configmap" {
2727
cluster_location = google_container_cluster.primary.location
2828
project_id = var.project_id
2929
upgrade = var.gcloud_upgrade
30-
skip_download = var.gcloud_skip_download
3130

3231

3332
kubectl_create_command = "${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -534,12 +534,6 @@ variable "gcloud_upgrade" {
534534
default = false
535535
}
536536

537-
variable "gcloud_skip_download" {
538-
type = bool
539-
description = "Whether to skip downloading gcloud (assumes gcloud is already available outside the module)"
540-
default = true
541-
}
542-
543537
variable "disable_default_snat" {
544538
type = bool
545539
description = "Whether to disable the default SNAT to support the private use of public IP addresses"

modules/beta-private-cluster/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ The resources/services/activations/deletions that this module will create/trigge
1010

1111
Sub modules are provided for creating private clusters, beta private clusters, and beta public clusters as well. Beta sub modules allow for the use of various GKE beta features. See the modules directory for the various sub modules.
1212

13+
NOTE:<br>
14+
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.
15+
See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.
16+
1317
## Private Cluster Details
1418
For details on configuring private clusters with this module, check the [troubleshooting guide](https://github.com/terraform-google-modules/terraform-google-kubernetes-engine/blob/master/docs/private_clusters.md).
1519

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

modules/beta-private-cluster/cluster.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,8 +422,7 @@ module "gcloud_wait_for_cluster" {
422422
version = "~> 2.0.2"
423423
enabled = ! var.skip_provisioners
424424

425-
upgrade = var.gcloud_upgrade
426-
skip_download = var.gcloud_skip_download
425+
upgrade = var.gcloud_upgrade
427426

428427
create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
429428
create_cmd_body = "${var.project_id} ${var.name}"

modules/beta-private-cluster/dns.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ module "gcloud_delete_default_kube_dns_configmap" {
2727
cluster_location = google_container_cluster.primary.location
2828
project_id = var.project_id
2929
upgrade = var.gcloud_upgrade
30-
skip_download = var.gcloud_skip_download
3130

3231

3332
kubectl_create_command = "${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"

modules/beta-private-cluster/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -534,12 +534,6 @@ variable "gcloud_upgrade" {
534534
default = false
535535
}
536536

537-
variable "gcloud_skip_download" {
538-
type = bool
539-
description = "Whether to skip downloading gcloud (assumes gcloud is already available outside the module)"
540-
default = true
541-
}
542-
543537
variable "disable_default_snat" {
544538
type = bool
545539
description = "Whether to disable the default SNAT to support the private use of public IP addresses"

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ The resources/services/activations/deletions that this module will create/trigge
1010

1111
Sub modules are provided for creating private clusters, beta private clusters, and beta public clusters as well. Beta sub modules allow for the use of various GKE beta features. See the modules directory for the various sub modules.
1212

13+
NOTE:<br>
14+
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.
15+
See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.
16+
1317
## Node Pool Update Variant
1418

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

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,8 +476,7 @@ module "gcloud_wait_for_cluster" {
476476
version = "~> 2.0.2"
477477
enabled = ! var.skip_provisioners
478478

479-
upgrade = var.gcloud_upgrade
480-
skip_download = var.gcloud_skip_download
479+
upgrade = var.gcloud_upgrade
481480

482481
create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
483482
create_cmd_body = "${var.project_id} ${var.name}"

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ module "gcloud_delete_default_kube_dns_configmap" {
2727
cluster_location = google_container_cluster.primary.location
2828
project_id = var.project_id
2929
upgrade = var.gcloud_upgrade
30-
skip_download = var.gcloud_skip_download
3130

3231

3332
kubectl_create_command = "${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -503,12 +503,6 @@ variable "gcloud_upgrade" {
503503
default = false
504504
}
505505

506-
variable "gcloud_skip_download" {
507-
type = bool
508-
description = "Whether to skip downloading gcloud (assumes gcloud is already available outside the module)"
509-
default = true
510-
}
511-
512506
variable "disable_default_snat" {
513507
type = bool
514508
description = "Whether to disable the default SNAT to support the private use of public IP addresses"

modules/beta-public-cluster/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ The resources/services/activations/deletions that this module will create/trigge
1010

1111
Sub modules are provided for creating private clusters, beta private clusters, and beta public clusters as well. Beta sub modules allow for the use of various GKE beta features. See the modules directory for the various sub modules.
1212

13+
NOTE:<br>
14+
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.
15+
See the [module](https://github.com/terraform-google-modules/terraform-google-gcloud#downloading) documentation for more information.
16+
1317
## Compatibility
1418

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

modules/beta-public-cluster/cluster.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,7 @@ module "gcloud_wait_for_cluster" {
403403
version = "~> 2.0.2"
404404
enabled = ! var.skip_provisioners
405405

406-
upgrade = var.gcloud_upgrade
407-
skip_download = var.gcloud_skip_download
406+
upgrade = var.gcloud_upgrade
408407

409408
create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
410409
create_cmd_body = "${var.project_id} ${var.name}"

modules/beta-public-cluster/dns.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ module "gcloud_delete_default_kube_dns_configmap" {
2727
cluster_location = google_container_cluster.primary.location
2828
project_id = var.project_id
2929
upgrade = var.gcloud_upgrade
30-
skip_download = var.gcloud_skip_download
3130

3231

3332
kubectl_create_command = "${path.module}/scripts/delete-default-resource.sh kube-system configmap kube-dns"

modules/beta-public-cluster/variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -503,12 +503,6 @@ variable "gcloud_upgrade" {
503503
default = false
504504
}
505505

506-
variable "gcloud_skip_download" {
507-
type = bool
508-
description = "Whether to skip downloading gcloud (assumes gcloud is already available outside the module)"
509-
default = true
510-
}
511-
512506
variable "disable_default_snat" {
513507
type = bool
514508
description = "Whether to disable the default SNAT to support the private use of public IP addresses"

0 commit comments

Comments
 (0)