From b9493d5866cec787bcd34119ae8f5085b49acf4d Mon Sep 17 00:00:00 2001 From: Bharath KKB Date: Thu, 10 Sep 2020 01:08:22 -0500 Subject: [PATCH] bump gcloud (#651) fix gcloud --- autogen/main/cluster.tf.tmpl | 2 +- autogen/main/dns.tf.tmpl | 2 +- cluster.tf | 2 +- dns.tf | 2 +- modules/asm/main.tf | 2 +- modules/beta-private-cluster-update-variant/cluster.tf | 2 +- modules/beta-private-cluster-update-variant/dns.tf | 2 +- modules/beta-private-cluster/cluster.tf | 2 +- modules/beta-private-cluster/dns.tf | 2 +- modules/beta-public-cluster-update-variant/cluster.tf | 2 +- modules/beta-public-cluster-update-variant/dns.tf | 2 +- modules/beta-public-cluster/cluster.tf | 2 +- modules/beta-public-cluster/dns.tf | 2 +- modules/hub/main.tf | 2 +- modules/k8s-operator-crd-support/main.tf | 8 ++++---- modules/private-cluster-update-variant/cluster.tf | 2 +- modules/private-cluster-update-variant/dns.tf | 2 +- modules/private-cluster/cluster.tf | 2 +- modules/private-cluster/dns.tf | 2 +- modules/workload-identity/main.tf | 2 +- 20 files changed, 23 insertions(+), 23 deletions(-) diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index 7621acdb53..4ad9fd8f30 100644 --- a/autogen/main/cluster.tf.tmpl +++ b/autogen/main/cluster.tf.tmpl @@ -547,7 +547,7 @@ resource "google_container_node_pool" "pools" { module "gcloud_wait_for_cluster" { source = "terraform-google-modules/gcloud/google" - version = "~> 1.3.0" + version = "~> 2.0.2" enabled = var.skip_provisioners upgrade = var.gcloud_upgrade diff --git a/autogen/main/dns.tf.tmpl b/autogen/main/dns.tf.tmpl index 4433095c8d..6aa2ca746f 100644 --- a/autogen/main/dns.tf.tmpl +++ b/autogen/main/dns.tf.tmpl @@ -21,7 +21,7 @@ *****************************************/ module "gcloud_delete_default_kube_dns_configmap" { source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper" - version = "~> 1.4" + version = "~> 2.0.2" enabled = (local.custom_kube_dns_config || local.upstream_nameservers_config) && ! var.skip_provisioners cluster_name = google_container_cluster.primary.name cluster_location = google_container_cluster.primary.location diff --git a/cluster.tf b/cluster.tf index 9ac925bd16..fc17c85eb4 100644 --- a/cluster.tf +++ b/cluster.tf @@ -251,7 +251,7 @@ resource "google_container_node_pool" "pools" { module "gcloud_wait_for_cluster" { source = "terraform-google-modules/gcloud/google" - version = "~> 1.3.0" + version = "~> 2.0.2" enabled = var.skip_provisioners upgrade = var.gcloud_upgrade diff --git a/dns.tf b/dns.tf index ed7fdfb01f..262b4a832c 100644 --- a/dns.tf +++ b/dns.tf @@ -21,7 +21,7 @@ *****************************************/ module "gcloud_delete_default_kube_dns_configmap" { source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper" - version = "~> 1.4" + version = "~> 2.0.2" enabled = (local.custom_kube_dns_config || local.upstream_nameservers_config) && ! var.skip_provisioners cluster_name = google_container_cluster.primary.name cluster_location = google_container_cluster.primary.location diff --git a/modules/asm/main.tf b/modules/asm/main.tf index 937a478c06..7e6ed09bb5 100644 --- a/modules/asm/main.tf +++ b/modules/asm/main.tf @@ -16,7 +16,7 @@ module "asm_install" { source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper" - version = "~> 1.4" + version = "~> 2.0.2" module_depends_on = [var.cluster_endpoint] gcloud_sdk_version = var.gcloud_sdk_version diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf index 5bc19f5dcc..c652b96530 100644 --- a/modules/beta-private-cluster-update-variant/cluster.tf +++ b/modules/beta-private-cluster-update-variant/cluster.tf @@ -493,7 +493,7 @@ resource "google_container_node_pool" "pools" { module "gcloud_wait_for_cluster" { source = "terraform-google-modules/gcloud/google" - version = "~> 1.3.0" + version = "~> 2.0.2" enabled = var.skip_provisioners upgrade = var.gcloud_upgrade diff --git a/modules/beta-private-cluster-update-variant/dns.tf b/modules/beta-private-cluster-update-variant/dns.tf index ed7fdfb01f..262b4a832c 100644 --- a/modules/beta-private-cluster-update-variant/dns.tf +++ b/modules/beta-private-cluster-update-variant/dns.tf @@ -21,7 +21,7 @@ *****************************************/ module "gcloud_delete_default_kube_dns_configmap" { source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper" - version = "~> 1.4" + version = "~> 2.0.2" enabled = (local.custom_kube_dns_config || local.upstream_nameservers_config) && ! var.skip_provisioners cluster_name = google_container_cluster.primary.name cluster_location = google_container_cluster.primary.location diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf index 38717b6bdb..3228becf90 100644 --- a/modules/beta-private-cluster/cluster.tf +++ b/modules/beta-private-cluster/cluster.tf @@ -420,7 +420,7 @@ resource "google_container_node_pool" "pools" { module "gcloud_wait_for_cluster" { source = "terraform-google-modules/gcloud/google" - version = "~> 1.3.0" + version = "~> 2.0.2" enabled = var.skip_provisioners upgrade = var.gcloud_upgrade diff --git a/modules/beta-private-cluster/dns.tf b/modules/beta-private-cluster/dns.tf index ed7fdfb01f..262b4a832c 100644 --- a/modules/beta-private-cluster/dns.tf +++ b/modules/beta-private-cluster/dns.tf @@ -21,7 +21,7 @@ *****************************************/ module "gcloud_delete_default_kube_dns_configmap" { source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper" - version = "~> 1.4" + version = "~> 2.0.2" enabled = (local.custom_kube_dns_config || local.upstream_nameservers_config) && ! var.skip_provisioners cluster_name = google_container_cluster.primary.name cluster_location = google_container_cluster.primary.location diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf index 913020353f..4886fe5cd8 100644 --- a/modules/beta-public-cluster-update-variant/cluster.tf +++ b/modules/beta-public-cluster-update-variant/cluster.tf @@ -474,7 +474,7 @@ resource "google_container_node_pool" "pools" { module "gcloud_wait_for_cluster" { source = "terraform-google-modules/gcloud/google" - version = "~> 1.3.0" + version = "~> 2.0.2" enabled = var.skip_provisioners upgrade = var.gcloud_upgrade diff --git a/modules/beta-public-cluster-update-variant/dns.tf b/modules/beta-public-cluster-update-variant/dns.tf index ed7fdfb01f..262b4a832c 100644 --- a/modules/beta-public-cluster-update-variant/dns.tf +++ b/modules/beta-public-cluster-update-variant/dns.tf @@ -21,7 +21,7 @@ *****************************************/ module "gcloud_delete_default_kube_dns_configmap" { source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper" - version = "~> 1.4" + version = "~> 2.0.2" enabled = (local.custom_kube_dns_config || local.upstream_nameservers_config) && ! var.skip_provisioners cluster_name = google_container_cluster.primary.name cluster_location = google_container_cluster.primary.location diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf index 4467bc2ae2..6e69b06201 100644 --- a/modules/beta-public-cluster/cluster.tf +++ b/modules/beta-public-cluster/cluster.tf @@ -401,7 +401,7 @@ resource "google_container_node_pool" "pools" { module "gcloud_wait_for_cluster" { source = "terraform-google-modules/gcloud/google" - version = "~> 1.3.0" + version = "~> 2.0.2" enabled = var.skip_provisioners upgrade = var.gcloud_upgrade diff --git a/modules/beta-public-cluster/dns.tf b/modules/beta-public-cluster/dns.tf index ed7fdfb01f..262b4a832c 100644 --- a/modules/beta-public-cluster/dns.tf +++ b/modules/beta-public-cluster/dns.tf @@ -21,7 +21,7 @@ *****************************************/ module "gcloud_delete_default_kube_dns_configmap" { source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper" - version = "~> 1.4" + version = "~> 2.0.2" enabled = (local.custom_kube_dns_config || local.upstream_nameservers_config) && ! var.skip_provisioners cluster_name = google_container_cluster.primary.name cluster_location = google_container_cluster.primary.location diff --git a/modules/hub/main.tf b/modules/hub/main.tf index 6b444c4ef0..a1a6b3c1d1 100644 --- a/modules/hub/main.tf +++ b/modules/hub/main.tf @@ -39,7 +39,7 @@ resource "google_service_account_key" "gke_hub_key" { module "gke_hub_registration" { source = "terraform-google-modules/gcloud/google" - version = "~> 1.0" + version = "~> 2.0.2" platform = "linux" gcloud_sdk_version = var.gcloud_sdk_version diff --git a/modules/k8s-operator-crd-support/main.tf b/modules/k8s-operator-crd-support/main.tf index cc6df9175a..5212d0d729 100644 --- a/modules/k8s-operator-crd-support/main.tf +++ b/modules/k8s-operator-crd-support/main.tf @@ -28,7 +28,7 @@ locals { module "k8sop_manifest" { source = "terraform-google-modules/gcloud/google" - version = "~> 1.3" + version = "~> 2.0.2" enabled = local.should_download_manifest skip_download = var.skip_gcloud_download @@ -41,7 +41,7 @@ module "k8sop_manifest" { module "k8s_operator" { source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper" - version = "~> 1.4" + version = "~> 2.0.2" module_depends_on = [module.k8sop_manifest.wait, var.cluster_endpoint] skip_download = var.skip_gcloud_download cluster_name = var.cluster_name @@ -61,7 +61,7 @@ resource "tls_private_key" "k8sop_creds" { module "k8sop_creds_secret" { source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper" - version = "~> 1.4" + version = "~> 2.0.2" module_depends_on = [module.k8s_operator.wait] skip_download = var.skip_gcloud_download cluster_name = var.cluster_name @@ -97,7 +97,7 @@ resource "local_file" "operator_cr" { module "k8sop_config" { source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper" - version = "~> 1.4" + version = "~> 2.0.2" module_depends_on = [module.k8s_operator.wait, module.k8sop_creds_secret.wait] skip_download = var.skip_gcloud_download cluster_name = var.cluster_name diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf index 53271c61ff..8248e8c3ad 100644 --- a/modules/private-cluster-update-variant/cluster.tf +++ b/modules/private-cluster-update-variant/cluster.tf @@ -337,7 +337,7 @@ resource "google_container_node_pool" "pools" { module "gcloud_wait_for_cluster" { source = "terraform-google-modules/gcloud/google" - version = "~> 1.3.0" + version = "~> 2.0.2" enabled = var.skip_provisioners upgrade = var.gcloud_upgrade diff --git a/modules/private-cluster-update-variant/dns.tf b/modules/private-cluster-update-variant/dns.tf index ed7fdfb01f..262b4a832c 100644 --- a/modules/private-cluster-update-variant/dns.tf +++ b/modules/private-cluster-update-variant/dns.tf @@ -21,7 +21,7 @@ *****************************************/ module "gcloud_delete_default_kube_dns_configmap" { source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper" - version = "~> 1.4" + version = "~> 2.0.2" enabled = (local.custom_kube_dns_config || local.upstream_nameservers_config) && ! var.skip_provisioners cluster_name = google_container_cluster.primary.name cluster_location = google_container_cluster.primary.location diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf index 03069cb1ff..463ec09c66 100644 --- a/modules/private-cluster/cluster.tf +++ b/modules/private-cluster/cluster.tf @@ -264,7 +264,7 @@ resource "google_container_node_pool" "pools" { module "gcloud_wait_for_cluster" { source = "terraform-google-modules/gcloud/google" - version = "~> 1.3.0" + version = "~> 2.0.2" enabled = var.skip_provisioners upgrade = var.gcloud_upgrade diff --git a/modules/private-cluster/dns.tf b/modules/private-cluster/dns.tf index ed7fdfb01f..262b4a832c 100644 --- a/modules/private-cluster/dns.tf +++ b/modules/private-cluster/dns.tf @@ -21,7 +21,7 @@ *****************************************/ module "gcloud_delete_default_kube_dns_configmap" { source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper" - version = "~> 1.4" + version = "~> 2.0.2" enabled = (local.custom_kube_dns_config || local.upstream_nameservers_config) && ! var.skip_provisioners cluster_name = google_container_cluster.primary.name cluster_location = google_container_cluster.primary.location diff --git a/modules/workload-identity/main.tf b/modules/workload-identity/main.tf index 04a4ae21ca..e17851c30d 100644 --- a/modules/workload-identity/main.tf +++ b/modules/workload-identity/main.tf @@ -45,7 +45,7 @@ resource "kubernetes_service_account" "main" { module "annotate-sa" { source = "terraform-google-modules/gcloud/google//modules/kubectl-wrapper" - version = "~> 1.4" + version = "~> 2.0.2" enabled = var.use_existing_k8s_sa skip_download = true