Skip to content

Commit

Permalink
bump gcloud (#651)
Browse files Browse the repository at this point in the history 
fix gcloud
  • Loading branch information
@bharathkkb
bharathkkb committed Sep 10, 2020
1 parent 55c7488 commit b9493d5
Show file tree
Hide file tree
Showing 20 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion autogen/main/cluster.tf.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion autogen/main/dns.tf.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dns.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/asm/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-private-cluster-update-variant/cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-private-cluster-update-variant/dns.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-private-cluster/cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-private-cluster/dns.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-public-cluster-update-variant/cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-public-cluster-update-variant/dns.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-public-cluster/cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-public-cluster/dns.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/hub/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions modules/k8s-operator-crd-support/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/private-cluster-update-variant/cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/private-cluster-update-variant/dns.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/private-cluster/cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/private-cluster/dns.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/workload-identity/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b9493d5

Please sign in to comment.