Skip to content

Commit

Permalink
fix: Ensure the ASM module's destroy command removes all ASM componen…
Browse files Browse the repository at this point in the history
…ts (#918)

Co-authored-by: Maarten Baijs <mbaijs@harlemnext.com>
  • Loading branch information
wieringen and Maarten Baijs committed Jun 4, 2021
1 parent ff71123 commit 00c2b71
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion examples/simple_zonal_with_asm/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ output "client_token" {
}

output "ca_certificate" {
value = module.gke.ca_certificate
sensitive = true
value = module.gke.ca_certificate
}

output "service_account" {
Expand Down
2 changes: 1 addition & 1 deletion modules/asm/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,5 @@ module "asm_install" {
impersonate_service_account = var.impersonate_service_account

kubectl_create_command = "${path.module}/scripts/install_asm.sh ${var.project_id} ${var.cluster_name} ${var.location} ${var.asm_version} ${var.mode} ${var.managed_control_plane} ${var.skip_validation} ${local.options_string} ${local.custom_overlays_string} ${var.enable_all} ${var.enable_cluster_roles} ${var.enable_cluster_labels} ${var.enable_gcp_components} ${var.enable_registration} ${var.outdir} ${var.ca} ${local.ca_cert} ${local.ca_key} ${local.root_cert} ${local.cert_chain} ${local.service_account_string} ${local.key_file_string} ${local.asm_git_tag_string}"
kubectl_destroy_command = "kubectl delete ns istio-system"
kubectl_destroy_command = "kubectl delete ns asm-system istio-system && kubectl label namespaces --all istio-injection-"
}

0 comments on commit 00c2b71

Please sign in to comment.