default gcloud module to ADC, expose via var

Author: bharathkkb

modules/asm/README.md

@@ -43,10 +43,12 @@ To deploy this config:
 | cluster\_endpoint | The GKE cluster endpoint. | string | n/a | yes |
 | cluster\_name | The unique name to identify the cluster in ASM. | string | n/a | yes |
 | enable\_gke\_hub\_registration | Enables GKE Hub Registration when set to true | bool | `"true"` | no |
+| gcloud\_sdk\_version | The gcloud sdk version to use. Minimum required version is 293.0.0 | string | `"294.0.0"` | no |
 | gke\_hub\_membership\_name | Memebership name that uniquely represents the cluster being registered on the Hub | string | `"gke-asm-membership"` | no |
 | gke\_hub\_sa\_name | Name for the GKE Hub SA stored as a secret `creds-gcp` in the `gke-connect` namespace. | string | `"gke-hub-sa"` | no |
 | 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 |
 | skip\_gcloud\_download | Whether to skip downloading gcloud (assumes gcloud and kubectl already available outside the module) | bool | `"true"` | no |
+| use\_tf\_google\_credentials\_env\_var | Optional GOOGLE_CREDENTIALS environment variable to be activated. | bool | `"false"` | no |
 
  <!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

modules/asm/main.tf

@@ -33,10 +33,10 @@ module "asm_install" {
   module_depends_on = [var.cluster_endpoint]
 
   platform                          = "linux"
-  gcloud_sdk_version                = "293.0.0"
+  gcloud_sdk_version                = var.gcloud_sdk_version
   skip_download                     = var.skip_gcloud_download
-  upgrade                           = false
-  use_tf_google_credentials_env_var = true
+  upgrade                           = true
+  use_tf_google_credentials_env_var = var.use_tf_google_credentials_env_var
   additional_components             = ["kubectl", "kpt", "anthoscli", "alpha"]
 
   create_cmd_entrypoint  = "${path.module}/scripts/install_asm.sh"
@@ -68,11 +68,11 @@ module "gke_hub_registration" {
   version = "~> 1.0"
 
   platform                          = "linux"
-  gcloud_sdk_version                = "293.0.0"
+  gcloud_sdk_version                = var.gcloud_sdk_version
   skip_download                     = var.skip_gcloud_download
-  upgrade                           = false
+  upgrade                           = true
   enabled                           = var.enable_gke_hub_registration
-  use_tf_google_credentials_env_var = true
+  use_tf_google_credentials_env_var = var.use_tf_google_credentials_env_var
   module_depends_on                 = [module.asm_install.wait]
 
   create_cmd_entrypoint  = "${path.module}/scripts/gke_hub_registration.sh"

modules/asm/variables.tf

@@ -40,6 +40,18 @@ variable "skip_gcloud_download" {
   default     = true
 }
 
+variable "use_tf_google_credentials_env_var" {
+  description = "Optional GOOGLE_CREDENTIALS environment variable to be activated."
+  type        = bool
+  default     = false
+}
+
+variable "gcloud_sdk_version" {
+  description = "The gcloud sdk version to use. Minimum required version is 293.0.0"
+  type        = string
+  default     = "294.0.0"
+}
+
 variable "enable_gke_hub_registration" {
   description = "Enables GKE Hub Registration when set to true"
   type        = bool