From fbced692cd880fac50892c65132c050a1769a107 Mon Sep 17 00:00:00 2001 From: cf-infra-bot Date: Wed, 29 Jun 2022 21:18:18 +0200 Subject: [PATCH 1/4] Update deployments --- bosh/deployments/bosh-deployment | 2 +- bosh/deployments/jumpbox-deployment | 2 +- deployment-versions.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bosh/deployments/bosh-deployment b/bosh/deployments/bosh-deployment index 5703c5038..e6243ed06 160000 --- a/bosh/deployments/bosh-deployment +++ b/bosh/deployments/bosh-deployment @@ -1 +1 @@ -Subproject commit 5703c5038461f39c9a3989f6906d3f4cf25d5598 +Subproject commit e6243ed06dd860b557a6e679e28ae13944bf1ad3 diff --git a/bosh/deployments/jumpbox-deployment b/bosh/deployments/jumpbox-deployment index fc32747a9..8eb534f63 160000 --- a/bosh/deployments/jumpbox-deployment +++ b/bosh/deployments/jumpbox-deployment @@ -1 +1 @@ -Subproject commit fc32747a9f5c1472b5f1fcbb09eebabb71e54298 +Subproject commit 8eb534f63aea36582082b691659a863be01907d0 diff --git a/deployment-versions.txt b/deployment-versions.txt index 9b52e2441..a79a8889d 100644 --- a/deployment-versions.txt +++ b/deployment-versions.txt @@ -1,2 +1,2 @@ -- *Current jumpbox-deployment: cloudfoundry/jumpbox-deployment@fc32747a9f5c1472b5f1fcbb09eebabb71e54298* -- *Current bosh-deployment: cloudfoundry/bosh-deployment@5703c5038461f39c9a3989f6906d3f4cf25d5598* +- *Current jumpbox-deployment: cloudfoundry/jumpbox-deployment@8eb534f63aea36582082b691659a863be01907d0* +- *Current bosh-deployment: cloudfoundry/bosh-deployment@e6243ed06dd860b557a6e679e28ae13944bf1ad3* From 3d618559f58a2b1aeb28e8306004abb163d141e3 Mon Sep 17 00:00:00 2001 From: cf-infra-bot Date: Fri, 1 Jul 2022 11:38:20 +0200 Subject: [PATCH 2/4] Update deployments --- bosh/deployments/bosh-deployment | 2 +- deployment-versions.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bosh/deployments/bosh-deployment b/bosh/deployments/bosh-deployment index e6243ed06..eebfbec3e 160000 --- a/bosh/deployments/bosh-deployment +++ b/bosh/deployments/bosh-deployment @@ -1 +1 @@ -Subproject commit e6243ed06dd860b557a6e679e28ae13944bf1ad3 +Subproject commit eebfbec3e6f9c7dea64c37665f21562693035abf diff --git a/deployment-versions.txt b/deployment-versions.txt index a79a8889d..fe42dfd65 100644 --- a/deployment-versions.txt +++ b/deployment-versions.txt @@ -1,2 +1,2 @@ - *Current jumpbox-deployment: cloudfoundry/jumpbox-deployment@8eb534f63aea36582082b691659a863be01907d0* -- *Current bosh-deployment: cloudfoundry/bosh-deployment@e6243ed06dd860b557a6e679e28ae13944bf1ad3* +- *Current bosh-deployment: cloudfoundry/bosh-deployment@eebfbec3e6f9c7dea64c37665f21562693035abf* From 5e4f954d88181dd992d490feebffd5573cad6d92 Mon Sep 17 00:00:00 2001 From: cf-infra-bot Date: Fri, 1 Jul 2022 21:45:43 +0200 Subject: [PATCH 3/4] Fix one of source_tags, source_ranges, or source_service_accounts must be defined --- terraform/gcp/templates/cf_lb.tf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/terraform/gcp/templates/cf_lb.tf b/terraform/gcp/templates/cf_lb.tf index 9419490c9..ed52389f7 100644 --- a/terraform/gcp/templates/cf_lb.tf +++ b/terraform/gcp/templates/cf_lb.tf @@ -136,6 +136,8 @@ resource "google_compute_firewall" "cf-ssh-proxy" { ports = ["2222"] } + source_ranges = ["0.0.0.0/0"] + target_tags = ["${google_compute_target_pool.cf-ssh-proxy.name}"] } @@ -167,6 +169,8 @@ resource "google_compute_firewall" "cf-tcp-router" { ports = ["1024-32768"] } + source_ranges = ["0.0.0.0/0"] + target_tags = ["${google_compute_target_pool.cf-tcp-router.name}"] } From 32e910e17df0d3d3f6a4fd41efc3b917dc6ee627 Mon Sep 17 00:00:00 2001 From: Peter Chen Date: Tue, 8 Nov 2022 16:00:07 -0800 Subject: [PATCH 4/4] Fix docs: reference `bbl destroy` instead of `bbl down` - `bbl destroy` is the replacement for `bbl down`, and `destroy` is the preferred command, though `bbl down` still exists as an undocumented (in `bbl -h`) command for backward compatibility purpose. - Hence, this commit replaces references to `bbl down` with `bbl destroy` in docs. (see discussion: https://github.com/cloudfoundry/bosh-bootloader/issues/542) --- README.md | 2 +- docs/cleaning-up.md | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 832acfc06..27e365975 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ Once you are done kicking the tires on CF and BOSH, clean up your environment to 1. You must first delete any deployments on BOSH. e.g. `bosh -d cf delete-deployment` -1. `bbl down` with your IaaS user/account information. +1. `bbl destroy` with your IaaS user/account information. ### Automating the automation tool diff --git a/docs/cleaning-up.md b/docs/cleaning-up.md index 0fb6c3d3c..ec97f7dab 100644 --- a/docs/cleaning-up.md +++ b/docs/cleaning-up.md @@ -2,10 +2,10 @@ In addition to creating resources for deploying BOSH, bbl has two subcommands for assisting you in cleaning up an environment after you are done with it: -`bbl down` and `bbl cleanup-leftovers`. +`bbl destroy` and `bbl cleanup-leftovers`. -## bbl down +## bbl destroy If you have the state file for a working environment, then bbl will destroy everything it has created. @@ -14,16 +14,16 @@ As a safety precaution, bbl will not delete the environment if there are running VMs deployed by the BOSH director. ``` -bbl down +bbl destroy ``` ## bbl cleanup-leftovers -Sometimes, `bbl down` isn't enough to do the job. +Sometimes, `bbl destroy` isn't enough to do the job. Perhaps you are in one of these situations: -* `bbl down` failed during deletion and lost information. +* `bbl destroy` failed during deletion and lost information. * The `bbl-state-dir` is on a computer that you no longer have access to. * You created resources outside of bbl that you want to nuke. * You are running bbl's acceptance tests and they failed, orphaning IaaS resources. @@ -33,7 +33,7 @@ cli utility [leftovers](https://github.com/genevieve/leftovers) as a subcommand in bbl. You can think of `bbl cleanup-leftovers` as kind of like -`bbl down --force`, but without the need for a `bbl-state-dir`. +`bbl destroy --force`, but without the need for a `bbl-state-dir`. **The filter is very important!**