From 3a1c5ebfe02dd88e58532876e42e73936850c96b Mon Sep 17 00:00:00 2001 From: Jochen Ehret Date: Mon, 8 May 2023 09:06:41 +0200 Subject: [PATCH 1/6] Use latest bbl docker image version * use image with latest bbl and Terraform versions: https://github.com/cloudfoundry/bosh-bootloader/blob/main/ci/dockerfiles/deployment/Dockerfile * temporarily deployed to "appruntimedeployments" repository until https://hub.docker.com/r/cfinfrastructure/deployment is updated again --- tasks/manage-gcp-dns/task.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/manage-gcp-dns/task.yml b/tasks/manage-gcp-dns/task.yml index 19bd9c20..4e3d7045 100644 --- a/tasks/manage-gcp-dns/task.yml +++ b/tasks/manage-gcp-dns/task.yml @@ -4,7 +4,8 @@ platform: linux image_resource: type: docker-image source: - repository: cloudfoundry/cf-deployment-concourse-tasks + repository: appruntimedeployments/bbl-deployment + tag: v9.0.0 inputs: - name: runtime-ci From e26d47192b2c07e86812a545292e412884b932e2 Mon Sep 17 00:00:00 2001 From: Jochen Ehret Date: Mon, 8 May 2023 14:07:29 +0200 Subject: [PATCH 2/6] use bbl-deployment v9.0.1 --- tasks/manage-gcp-dns/task.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/manage-gcp-dns/task.yml b/tasks/manage-gcp-dns/task.yml index 4e3d7045..e9162c5f 100644 --- a/tasks/manage-gcp-dns/task.yml +++ b/tasks/manage-gcp-dns/task.yml @@ -5,7 +5,7 @@ image_resource: type: docker-image source: repository: appruntimedeployments/bbl-deployment - tag: v9.0.0 + tag: v9.0.1 inputs: - name: runtime-ci From dbab9e7edb7257b49c718192b974fc3300caa00c Mon Sep 17 00:00:00 2001 From: Jochen Ehret Date: Mon, 8 May 2023 14:23:35 +0200 Subject: [PATCH 3/6] add "terraform init" to manage-gcp-dns task --- tasks/manage-gcp-dns/task | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/manage-gcp-dns/task b/tasks/manage-gcp-dns/task index 22e4d863..96d3e4a4 100755 --- a/tasks/manage-gcp-dns/task +++ b/tasks/manage-gcp-dns/task @@ -14,6 +14,7 @@ function write_service_account_key_to_file() { } function main() { + terraform init load_from_json_config local gcp_service_account_key_path From 38535b0b841bdb95f001e4b18b5cd20219ab034e Mon Sep 17 00:00:00 2001 From: Jochen Ehret Date: Mon, 8 May 2023 14:45:41 +0200 Subject: [PATCH 4/6] call "terraform init" in bbl state terraform directory --- tasks/manage-gcp-dns/task | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tasks/manage-gcp-dns/task b/tasks/manage-gcp-dns/task index 96d3e4a4..bb8eff9c 100755 --- a/tasks/manage-gcp-dns/task +++ b/tasks/manage-gcp-dns/task @@ -14,7 +14,6 @@ function write_service_account_key_to_file() { } function main() { - terraform init load_from_json_config local gcp_service_account_key_path @@ -27,6 +26,9 @@ function main() { local dns_servers dns_servers=() if [[ -d "${ROOT}/bbl-state" ]]; then + pushd "${ROOT}/bbl-state/${BBL_STATE_DIR}/terraform" > /dev/null + terraform init + popd > /dev/null for dns_server in $(bbl --state-dir "${ROOT}/bbl-state/${BBL_STATE_DIR}" lbs --json | jq -r ".cf_system_domain_dns_servers[] | ."); do dns_servers+=("${dns_server}") done From e4c3475e78f10481d7f2ddad9bcc3f26534916fd Mon Sep 17 00:00:00 2001 From: Jochen Ehret Date: Mon, 8 May 2023 15:53:24 +0200 Subject: [PATCH 5/6] call "terraform init" before "bbl lbs"/"bbl outputs" --- tasks/generate-external-db-vars-file/task | 4 ++++ tasks/generate-external-ip-db-vars/task | 4 ++++ tasks/manage-gcp-dns/task | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tasks/generate-external-db-vars-file/task b/tasks/generate-external-db-vars-file/task index 78b88221..2dfd6f85 100755 --- a/tasks/generate-external-db-vars-file/task +++ b/tasks/generate-external-db-vars-file/task @@ -3,6 +3,10 @@ set -euo pipefail pushd "bbl-state/${BBL_STATE_DIR}" + echo "Initializing Terraform..." + pushd "./terraform" + terraform init + popd echo "Retrieving DB name from bbl outputs..." DB_NAME=$(bbl outputs | grep db_name | awk '{print $2}') popd diff --git a/tasks/generate-external-ip-db-vars/task b/tasks/generate-external-ip-db-vars/task index f287ecbd..1f007834 100755 --- a/tasks/generate-external-ip-db-vars/task +++ b/tasks/generate-external-ip-db-vars/task @@ -8,6 +8,10 @@ VARIABLE_DIR=${root_dir}/bbl-state/${VARS_DIR} cd bbl-state/$BBL_STATE_DIR set +x + echo "Initializing Terraform..." + pushd "./terraform" + terraform init + popd echo "Grabbing public ips" echo "Outputting public ips to ${VARIABLE_DIR}/external-public-ip-vars.yml" bbl outputs | grep public_ip > ${VARIABLE_DIR}/external-public-ip-vars.yml diff --git a/tasks/manage-gcp-dns/task b/tasks/manage-gcp-dns/task index bb8eff9c..74c87cb6 100755 --- a/tasks/manage-gcp-dns/task +++ b/tasks/manage-gcp-dns/task @@ -26,9 +26,9 @@ function main() { local dns_servers dns_servers=() if [[ -d "${ROOT}/bbl-state" ]]; then - pushd "${ROOT}/bbl-state/${BBL_STATE_DIR}/terraform" > /dev/null + pushd "${ROOT}/bbl-state/${BBL_STATE_DIR}/terraform" terraform init - popd > /dev/null + popd for dns_server in $(bbl --state-dir "${ROOT}/bbl-state/${BBL_STATE_DIR}" lbs --json | jq -r ".cf_system_domain_dns_servers[] | ."); do dns_servers+=("${dns_server}") done From ad79ff60183db0c7b4af993e951e2c5d769f7741 Mon Sep 17 00:00:00 2001 From: Carson Long Date: Tue, 9 May 2023 09:08:37 -0700 Subject: [PATCH 6/6] call `terraform init` in generate-drats-config task --- tasks/generate-drats-config/task | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tasks/generate-drats-config/task b/tasks/generate-drats-config/task index 2c33fcf1..6370b287 100755 --- a/tasks/generate-drats-config/task +++ b/tasks/generate-drats-config/task @@ -9,6 +9,10 @@ setup_bosh_env_vars set +x pushd bbl-state/"${BBL_STATE_DIR}" > /dev/null + echo "Initializing Terraform..." + pushd "terraform" + terraform init + popd BOSH_GW_PRIVATE_KEY="$(bbl ssh-key)" BOSH_GW_HOST=$(bbl jumpbox-address) popd > /dev/null