Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 0 additions & 40 deletions .buildkite/configs/cleanup.gcp.yml

This file was deleted.

31 changes: 0 additions & 31 deletions .buildkite/hooks/pre-command
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ WORKSPACE=$(pwd)
export WORKSPACE


GCP_SERVICE_ACCOUNT_SECRET_PATH=secret/ci/elastic-elastic-package/gcp-service-account
AWS_SERVICE_ACCOUNT_SECRET_PATH=kv/ci-shared/platform-ingest/aws_account_auth
GITHUB_TOKEN_VAULT_PATH=kv/ci-shared/platform-ingest/github_token
PRIVATE_CI_GCS_CREDENTIALS_PATH=kv/ci-shared/platform-ingest/gcp-platform-ingest-ci-service-account
Expand Down Expand Up @@ -82,27 +81,6 @@ if is_step_required_to_upload_safe_logs; then
export JOB_GCS_BUCKET_INTERNAL="ingest-buildkite-ci"
fi

is_step_testing_gcp () {
if [[ "$BUILDKITE_PIPELINE_SLUG" != "elastic-package" ]]; then
return 1
fi
if [[ "$BUILDKITE_STEP_KEY" == "integration-parallel-gcp-agent-false" || "$BUILDKITE_STEP_KEY" == "integration-parallel-gcp-agent-true" ]]; then
return 0
fi
return 1
}

if is_step_testing_gcp; then
ELASTIC_PACKAGE_GCP_PROJECT_SECRET=$(retry 5 vault read -field projectId ${GCP_SERVICE_ACCOUNT_SECRET_PATH})
export ELASTIC_PACKAGE_GCP_PROJECT_SECRET
ELASTIC_PACKAGE_GCP_CREDENTIALS_SECRET=$(retry 5 vault read -field credentials ${GCP_SERVICE_ACCOUNT_SECRET_PATH} | jq -c)
export ELASTIC_PACKAGE_GCP_CREDENTIALS_SECRET

# Environment variables required by the service deployer
export GOOGLE_CREDENTIALS=${ELASTIC_PACKAGE_GCP_CREDENTIALS_SECRET}
export GCP_PROJECT_ID=${ELASTIC_PACKAGE_GCP_PROJECT_SECRET}
fi

is_step_testing_aws () {
if [[ "$BUILDKITE_PIPELINE_SLUG" != "elastic-package" ]]; then
return 1
Expand Down Expand Up @@ -148,15 +126,6 @@ if [[ "$BUILDKITE_PIPELINE_SLUG" == "elastic-package-cloud-cleanup" && "$BUILDKI
export ELASTIC_PACKAGE_AWS_ACCESS_KEY
ELASTIC_PACKAGE_AWS_USER_SECRET=$(retry 5 vault kv get -field user ${AWS_SERVICE_ACCOUNT_SECRET_PATH})
export ELASTIC_PACKAGE_AWS_USER_SECRET

ELASTIC_PACKAGE_GCP_CREDENTIALS_SECRET=$(retry 5 vault read -field credentials ${GCP_SERVICE_ACCOUNT_SECRET_PATH} | jq -c)
export ELASTIC_PACKAGE_GCP_CREDENTIALS_SECRET
ELASTIC_PACKAGE_GCP_KEY_SECRET=$(echo "${ELASTIC_PACKAGE_GCP_CREDENTIALS_SECRET}" | jq -r '.private_key' | tr -d '\n')
export ELASTIC_PACKAGE_GCP_KEY_SECRET
ELASTIC_PACKAGE_GCP_PROJECT_SECRET=$(retry 5 vault read -field projectId ${GCP_SERVICE_ACCOUNT_SECRET_PATH})
export ELASTIC_PACKAGE_GCP_PROJECT_SECRET
ELASTIC_PACKAGE_GCP_EMAIL_SECRET=$(retry 5 vault read -field username ${GCP_SERVICE_ACCOUNT_SECRET_PATH})
export ELASTIC_PACKAGE_GCP_EMAIL_SECRET
fi


Expand Down
33 changes: 0 additions & 33 deletions .buildkite/scripts/cloud-cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ trap cleanup_cloud_stale EXIT
set -euo pipefail

AWS_RESOURCES_FILE="aws.resources.txt"
GCP_RESOURCES_FILE="gcp.resources.txt"
AWS_REDSHIFT_RESOURCES_FILE="redshift_clusters.json"

RESOURCE_RETENTION_PERIOD="${RESOURCE_RETENTION_PERIOD:-"24 hours"}"
Expand Down Expand Up @@ -78,38 +77,6 @@ cloud_reaper_aws() {
${COMMAND} | tee "${AWS_RESOURCES_FILE}"
}

cloud_reaper_gcp() {
echo "Validating configuration"
docker run --rm -v "$(pwd)/.buildkite/configs/cleanup.gcp.yml":/etc/cloud-reaper/config.yml \
-e ACCOUNT_SECRET="${ELASTIC_PACKAGE_GCP_KEY_SECRET}" \
-e ACCOUNT_KEY="${ELASTIC_PACKAGE_GCP_EMAIL_SECRET}" \
-e ACCOUNT_PROJECT="${ELASTIC_PACKAGE_GCP_PROJECT_SECRET}" \
-e CREATION_DATE="${DELETE_RESOURCES_BEFORE_DATE}" \
"${CLOUD_REAPER_IMAGE}" \
cloud-reaper \
--config /etc/cloud-reaper/config.yml \
validate

echo "Scanning resources"
docker run --rm -v "$(pwd)/.buildkite/configs/cleanup.gcp.yml":/etc/cloud-reaper/config.yml \
-e ACCOUNT_SECRET="${ELASTIC_PACKAGE_GCP_KEY_SECRET}" \
-e ACCOUNT_KEY="${ELASTIC_PACKAGE_GCP_EMAIL_SECRET}" \
-e ACCOUNT_PROJECT="${ELASTIC_PACKAGE_GCP_PROJECT_SECRET}" \
-e CREATION_DATE="${DELETE_RESOURCES_BEFORE_DATE}" \
"${CLOUD_REAPER_IMAGE}" \
cloud-reaper \
--config /etc/cloud-reaper/config.yml \
${COMMAND} | tee "${GCP_RESOURCES_FILE}"
}

echo "--- Cleaning up GCP resources older than ${DELETE_RESOURCES_BEFORE_DATE}..."
cloud_reaper_gcp

if any_resources_to_delete "${GCP_RESOURCES_FILE}"; then
echo "Pending GCP resources"
resources_to_delete=1
fi

echo "--- Cleaning up AWS resources older than ${DELETE_RESOURCES_BEFORE_DATE}..."
cloud_reaper_aws

Expand Down
3 changes: 0 additions & 3 deletions test/packages/parallel/gcp/_dev/build/build.yml

This file was deleted.

22 changes: 0 additions & 22 deletions test/packages/parallel/gcp/_dev/build/docs/README.md

This file was deleted.

9 changes: 0 additions & 9 deletions test/packages/parallel/gcp/_dev/build/docs/compute.md

This file was deleted.

80 changes: 0 additions & 80 deletions test/packages/parallel/gcp/changelog.yml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading