Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 08:58:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 111

Update sandbox tool scripts to work right with sandcastle-style tags (#9298)

Browse source 
We want the sandcastle branch as a source (but it could be anything we
choose), but a vX.Y.Z-A version tag over in the sandbox, so split those
into 2 asked variables.
This commit is contained in:
Robert Fairburn 2023-01-12 10:25:50 -06:00 committed by GitHub
parent e8527c2b0d
commit bc142b57e3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
infrastructure/sandbox/PreProvisioner/lambda/deploy_terraform/main.tf
View file

@ -157,7 +157,7 @@ resource "helm_release" "main" {
set {
name = "imageTag"
value = "v4.25.0-1"
value = "v4.25.0-2"
}
set {

12
infrastructure/sandbox/tools/upgrade_ecr_ecs.sh
View file

@ -28,12 +28,15 @@ case "$(uname)" in
esac
# TF_VAR_slack_webhook is redundant, but let's provide a common
# interface.
# interface. Since we tag Sandcastle builds separate from the
# released version, we need the separate ECR_IMAGE_VERSION
# variable.
EXPECTED_VARIABLES=(
TF_VAR_slack_webhook
CLOUDFLARE_API_TOKEN
FLEET_VERSION
ECR_IMAGE_VERSION
)
for VARIABLE in ${EXPECTED_VARIABLES[@]}; do
@ -41,7 +44,7 @@ for VARIABLE in ${EXPECTED_VARIABLES[@]}; do
done
FLEET_ECR_REPO="411315989055.dkr.ecr.us-east-2.amazonaws.com"
FLEET_ECR_IMAGE="${FLEET_ECR_REPO:?}/sandbox-prod-eks:${FLEET_VERSION:?}"
FLEET_ECR_IMAGE="${FLEET_ECR_REPO:?}/sandbox-prod-eks:${ECR_IMAGE_VERSION:?}"
FLEET_DOCKERHUB_IMAGE="fleetdm/fleet:${FLEET_VERSION:?}"
pushd "$(dirname ${0})/.."
@ -56,7 +59,10 @@ docker tag "${FLEET_DOCKERHUB_IMAGE:?}" "${FLEET_ECR_IMAGE:?}"
docker push "${FLEET_ECR_IMAGE:?}"
# Update the terraform to deploy FLEET_VERSION. Requires gsed on Darwin!
${SED:?} -i '/name = "imageTag"/!b;n;c\ value = "'${FLEET_VERSION:?}'"' PreProvisioner/lambda/deploy_terraform/main.tf
${SED:?} -i '/name = "imageTag"/!b;n;c\ value = "'${ECR_IMAGE_VERSION:?}'"' PreProvisioner/lambda/deploy_terraform/main.tf
# Before running terraform, clean up the deprovisioner just in case
rm -rf ./JITProvisioner/deprovisioner/deploy_terraform/.terraform
terraform init --backend-config=backend-prod.conf