Skip to content

Commit 356ed6d

Browse files
authored
feat: remove wait for cluster script (#801)
* feat: remove wait for cluster script * remove script from all submodules
1 parent 6a29e62 commit 356ed6d

File tree

25 files changed

+24
-494
lines changed

25 files changed

+24
-494
lines changed

autogen/main/cluster.tf.tmpl

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -602,19 +602,3 @@ resource "google_container_node_pool" "pools" {
602602
}
603603
}
604604

605-
module "gcloud_wait_for_cluster" {
606-
source = "terraform-google-modules/gcloud/google"
607-
version = "~> 2.0.2"
608-
enabled = ! var.skip_provisioners
609-
upgrade = var.gcloud_upgrade
610-
611-
create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
612-
create_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"
613-
destroy_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
614-
destroy_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"
615-
616-
module_depends_on = concat(
617-
[google_container_cluster.primary.master_version],
618-
[for pool in google_container_node_pool.pools : pool.name]
619-
)
620-
}

autogen/main/outputs.tf.tmpl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ output "endpoint" {
5454
*/
5555
google_container_cluster.primary,
5656
google_container_node_pool.pools,
57-
module.gcloud_wait_for_cluster.wait,
5857
]
5958
}
6059

autogen/main/scripts/wait-for-cluster.sh

Lines changed: 0 additions & 44 deletions
This file was deleted.

cluster.tf

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -320,19 +320,3 @@ resource "google_container_node_pool" "pools" {
320320
}
321321
}
322322

323-
module "gcloud_wait_for_cluster" {
324-
source = "terraform-google-modules/gcloud/google"
325-
version = "~> 2.0.2"
326-
enabled = ! var.skip_provisioners
327-
upgrade = var.gcloud_upgrade
328-
329-
create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
330-
create_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"
331-
destroy_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
332-
destroy_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"
333-
334-
module_depends_on = concat(
335-
[google_container_cluster.primary.master_version],
336-
[for pool in google_container_node_pool.pools : pool.name]
337-
)
338-
}

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -555,19 +555,3 @@ resource "google_container_node_pool" "pools" {
555555
}
556556
}
557557

558-
module "gcloud_wait_for_cluster" {
559-
source = "terraform-google-modules/gcloud/google"
560-
version = "~> 2.0.2"
561-
enabled = ! var.skip_provisioners
562-
upgrade = var.gcloud_upgrade
563-
564-
create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
565-
create_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"
566-
destroy_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
567-
destroy_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"
568-
569-
module_depends_on = concat(
570-
[google_container_cluster.primary.master_version],
571-
[for pool in google_container_node_pool.pools : pool.name]
572-
)
573-
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ output "endpoint" {
5454
*/
5555
google_container_cluster.primary,
5656
google_container_node_pool.pools,
57-
module.gcloud_wait_for_cluster.wait,
5857
]
5958
}
6059

modules/beta-private-cluster-update-variant/scripts/wait-for-cluster.sh

Lines changed: 0 additions & 44 deletions
This file was deleted.

modules/beta-private-cluster/cluster.tf

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -470,19 +470,3 @@ resource "google_container_node_pool" "pools" {
470470
}
471471
}
472472

473-
module "gcloud_wait_for_cluster" {
474-
source = "terraform-google-modules/gcloud/google"
475-
version = "~> 2.0.2"
476-
enabled = ! var.skip_provisioners
477-
upgrade = var.gcloud_upgrade
478-
479-
create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
480-
create_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"
481-
destroy_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
482-
destroy_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"
483-
484-
module_depends_on = concat(
485-
[google_container_cluster.primary.master_version],
486-
[for pool in google_container_node_pool.pools : pool.name]
487-
)
488-
}

modules/beta-private-cluster/outputs.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ output "endpoint" {
5454
*/
5555
google_container_cluster.primary,
5656
google_container_node_pool.pools,
57-
module.gcloud_wait_for_cluster.wait,
5857
]
5958
}
6059

modules/beta-private-cluster/scripts/wait-for-cluster.sh

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)