Skip to content

Commit

Permalink
fix: removing gcloud_skip_download variable
Browse files Browse the repository at this point in the history
  • Loading branch information
marko7460 committed Oct 15, 2020
1 parent 2cb4fae commit 5e86276
Show file tree
Hide file tree
Showing 46 changed files with 42 additions and 124 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ The resources/services/activations/deletions that this module will create/trigge

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.

NOTE:<br>
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.

## Compatibility

This module is meant for use with Terraform 0.12. If you haven't
Expand Down Expand Up @@ -131,7 +135,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 |
Expand Down
4 changes: 4 additions & 0 deletions autogen/main/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ The resources/services/activations/deletions that this module will create/trigge

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.

NOTE:<br>
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.

{% if private_cluster %}
## Private Cluster Details
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).
Expand Down
1 change: 0 additions & 1 deletion autogen/main/cluster.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
1 change: 0 additions & 1 deletion autogen/main/dns.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 0 additions & 6 deletions autogen/main/variables.tf.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
1 change: 0 additions & 1 deletion dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion modules/acm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
1 change: 0 additions & 1 deletion modules/acm/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions modules/acm/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion modules/asm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion modules/asm/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions modules/asm/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion modules/beta-private-cluster-update-variant/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ The resources/services/activations/deletions that this module will create/trigge

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.

NOTE:<br>
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.

## Private Cluster Details
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).

Expand Down Expand Up @@ -175,7 +179,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 |
Expand Down
3 changes: 1 addition & 2 deletions modules/beta-private-cluster-update-variant/cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
1 change: 0 additions & 1 deletion modules/beta-private-cluster-update-variant/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 0 additions & 6 deletions modules/beta-private-cluster-update-variant/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion modules/beta-private-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ The resources/services/activations/deletions that this module will create/trigge

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.

NOTE:<br>
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.

## Private Cluster Details
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).

Expand Down Expand Up @@ -153,7 +157,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 |
Expand Down
3 changes: 1 addition & 2 deletions modules/beta-private-cluster/cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
1 change: 0 additions & 1 deletion modules/beta-private-cluster/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 0 additions & 6 deletions modules/beta-private-cluster/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion modules/beta-public-cluster-update-variant/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ The resources/services/activations/deletions that this module will create/trigge

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.

NOTE:<br>
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.

## Node Pool Update Variant

In [#256] update variants added support for node pools to be created before being destroyed.
Expand Down Expand Up @@ -166,7 +170,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 |
Expand Down
3 changes: 1 addition & 2 deletions modules/beta-public-cluster-update-variant/cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
1 change: 0 additions & 1 deletion modules/beta-public-cluster-update-variant/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 0 additions & 6 deletions modules/beta-public-cluster-update-variant/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 4 additions & 1 deletion modules/beta-public-cluster/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ The resources/services/activations/deletions that this module will create/trigge

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.

NOTE:<br>
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.

## Compatibility

This module is meant for use with Terraform 0.12. If you haven't
Expand Down Expand Up @@ -144,7 +148,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 |
Expand Down
3 changes: 1 addition & 2 deletions modules/beta-public-cluster/cluster.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
1 change: 0 additions & 1 deletion modules/beta-public-cluster/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 0 additions & 6 deletions modules/beta-public-cluster/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading

0 comments on commit 5e86276

Please sign in to comment.