Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: remove wait for cluster script #801

Merged
merged 2 commits into from
Jan 28, 2021
Merged

feat: remove wait for cluster script #801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1468ac1
feat: remove wait for cluster script
bharathkkb Jan 28, 2021
c9e7133
remove script from all submodules
bharathkkb Jan 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 0 additions & 16 deletions autogen/main/cluster.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,19 +602,3 @@ resource "google_container_node_pool" "pools" {
}
}

module "gcloud_wait_for_cluster" {
source = "terraform-google-modules/gcloud/google"
version = "~> 2.0.2"
enabled = ! var.skip_provisioners
upgrade = var.gcloud_upgrade

create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
create_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"
destroy_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
destroy_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"

module_depends_on = concat(
[google_container_cluster.primary.master_version],
[for pool in google_container_node_pool.pools : pool.name]
)
}
1 change: 0 additions & 1 deletion autogen/main/outputs.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ output "endpoint" {
*/
google_container_cluster.primary,
google_container_node_pool.pools,
module.gcloud_wait_for_cluster.wait,
]
}

Expand Down
44 changes: 0 additions & 44 deletions autogen/main/scripts/wait-for-cluster.sh
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,19 +320,3 @@ resource "google_container_node_pool" "pools" {
}
}

module "gcloud_wait_for_cluster" {
source = "terraform-google-modules/gcloud/google"
version = "~> 2.0.2"
enabled = ! var.skip_provisioners
upgrade = var.gcloud_upgrade

create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
create_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"
destroy_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
destroy_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"

module_depends_on = concat(
[google_container_cluster.primary.master_version],
[for pool in google_container_node_pool.pools : pool.name]
)
}
16 changes: 0 additions & 16 deletions modules/beta-private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,19 +555,3 @@ resource "google_container_node_pool" "pools" {
}
}

module "gcloud_wait_for_cluster" {
source = "terraform-google-modules/gcloud/google"
version = "~> 2.0.2"
enabled = ! var.skip_provisioners
upgrade = var.gcloud_upgrade

create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
create_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"
destroy_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
destroy_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"

module_depends_on = concat(
[google_container_cluster.primary.master_version],
[for pool in google_container_node_pool.pools : pool.name]
)
}
1 change: 0 additions & 1 deletion modules/beta-private-cluster-update-variant/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ output "endpoint" {
*/
google_container_cluster.primary,
google_container_node_pool.pools,
module.gcloud_wait_for_cluster.wait,
]
}

Expand Down
44 changes: 0 additions & 44 deletions modules/beta-private-cluster-update-variant/scripts/wait-for-cluster.sh
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions modules/beta-private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,19 +470,3 @@ resource "google_container_node_pool" "pools" {
}
}

module "gcloud_wait_for_cluster" {
source = "terraform-google-modules/gcloud/google"
version = "~> 2.0.2"
enabled = ! var.skip_provisioners
upgrade = var.gcloud_upgrade

create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
create_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"
destroy_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
destroy_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"

module_depends_on = concat(
[google_container_cluster.primary.master_version],
[for pool in google_container_node_pool.pools : pool.name]
)
}
1 change: 0 additions & 1 deletion modules/beta-private-cluster/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ output "endpoint" {
*/
google_container_cluster.primary,
google_container_node_pool.pools,
module.gcloud_wait_for_cluster.wait,
]
}

Expand Down
44 changes: 0 additions & 44 deletions modules/beta-private-cluster/scripts/wait-for-cluster.sh
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions modules/beta-public-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,19 +536,3 @@ resource "google_container_node_pool" "pools" {
}
}

module "gcloud_wait_for_cluster" {
source = "terraform-google-modules/gcloud/google"
version = "~> 2.0.2"
enabled = ! var.skip_provisioners
upgrade = var.gcloud_upgrade

create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
create_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"
destroy_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
destroy_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"

module_depends_on = concat(
[google_container_cluster.primary.master_version],
[for pool in google_container_node_pool.pools : pool.name]
)
}
1 change: 0 additions & 1 deletion modules/beta-public-cluster-update-variant/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ output "endpoint" {
*/
google_container_cluster.primary,
google_container_node_pool.pools,
module.gcloud_wait_for_cluster.wait,
]
}

Expand Down
44 changes: 0 additions & 44 deletions modules/beta-public-cluster-update-variant/scripts/wait-for-cluster.sh
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions modules/beta-public-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,19 +451,3 @@ resource "google_container_node_pool" "pools" {
}
}

module "gcloud_wait_for_cluster" {
source = "terraform-google-modules/gcloud/google"
version = "~> 2.0.2"
enabled = ! var.skip_provisioners
upgrade = var.gcloud_upgrade

create_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
create_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"
destroy_cmd_entrypoint = "${path.module}/scripts/wait-for-cluster.sh"
destroy_cmd_body = "${var.project_id} ${var.name} ${local.location} ${var.impersonate_service_account}"

module_depends_on = concat(
[google_container_cluster.primary.master_version],
[for pool in google_container_node_pool.pools : pool.name]
)
}
1 change: 0 additions & 1 deletion modules/beta-public-cluster/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ output "endpoint" {
*/
google_container_cluster.primary,
google_container_node_pool.pools,
module.gcloud_wait_for_cluster.wait,
]
}

Expand Down
44 changes: 0 additions & 44 deletions modules/beta-public-cluster/scripts/wait-for-cluster.sh
View file
Open in desktop

This file was deleted.