From 46bc5e5960be660f47126f68bdba3c0abacaebd9 Mon Sep 17 00:00:00 2001 From: Jenny Shih Date: Fri, 26 Apr 2024 15:48:47 -0400 Subject: [PATCH 1/7] change ami filter to AL2023 --- terraform/deploy.sh | 2 +- terraform/deploy_ami_rotate.sh | 2 +- terraform/deploy_ami_rotate_codebuild_script.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/terraform/deploy.sh b/terraform/deploy.sh index 74cb4e63..8681784c 100755 --- a/terraform/deploy.sh +++ b/terraform/deploy.sh @@ -16,7 +16,7 @@ echo $aws_tfstate cd $CALCLOUD_BUILD_DIR/ami_rotation ami_json=$(echo $(awsudo $ADMIN_ARN aws ec2 describe-images --region us-east-1 --executable-users self)) ci_ami=`python3 parse_image_json.py "${ami_json}" STSCI-AWS-Linux-2` -ecs_ami=`python3 parse_image_json.py "${ami_json}" STSCI-HST-REPRO-ECS` +ecs_ami=`python3 parse_image_json.py "${ami_json}" STSCI-ECS-AL2023` if [[ "$ci_ami" =~ ^ami-[a-z0-9]+$ ]]; then echo $ci_ami diff --git a/terraform/deploy_ami_rotate.sh b/terraform/deploy_ami_rotate.sh index 3320ef1f..66cbf47b 100755 --- a/terraform/deploy_ami_rotate.sh +++ b/terraform/deploy_ami_rotate.sh @@ -77,7 +77,7 @@ echo $aws_tfstate cd $CALCLOUD_BUILD_DIR/ami_rotation ami_json=$(echo $(awsudo $ADMIN_ARN aws ec2 describe-images --region us-east-1 --executable-users self)) ci_ami=`python3 parse_image_json.py "${ami_json}" STSCI-AWS-Linux-2` -ecs_ami=`python3 parse_image_json.py "${ami_json}" STSCI-HST-REPRO-ECS` +ecs_ami=`python3 parse_image_json.py "${ami_json}" STSCI-ECS-AL2023` if [[ "$ci_ami" =~ ^ami-[a-z0-9]+$ ]]; then echo $ci_ami diff --git a/terraform/deploy_ami_rotate_codebuild_script.sh b/terraform/deploy_ami_rotate_codebuild_script.sh index 3bc62eac..7685d630 100755 --- a/terraform/deploy_ami_rotate_codebuild_script.sh +++ b/terraform/deploy_ami_rotate_codebuild_script.sh @@ -78,7 +78,7 @@ echo $aws_tfstate cd $CALCLOUD_BUILD_DIR/ami_rotation ami_json=$(echo $(aws ec2 describe-images --region us-east-1 --executable-users self)) ci_ami=`python3 parse_image_json.py "${ami_json}" STSCI-AWS-Linux-2` -ecs_ami=`python3 parse_image_json.py "${ami_json}" STSCI-HST-REPRO-ECS` +ecs_ami=`python3 parse_image_json.py "${ami_json}" STSCI-ECS-AL2023` if [[ "$ci_ami" =~ ^ami-[a-z0-9]+$ ]]; then echo $ci_ami From 8bcc16a6c5314f059b45c9215405d242e73baba2 Mon Sep 17 00:00:00 2001 From: Jenny Shih Date: Fri, 17 May 2024 16:14:16 -0400 Subject: [PATCH 2/7] update comment --- terraform/deploy_ami_rotation_codebuild_image.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/terraform/deploy_ami_rotation_codebuild_image.sh b/terraform/deploy_ami_rotation_codebuild_image.sh index 38c37c86..5364b0e0 100755 --- a/terraform/deploy_ami_rotation_codebuild_image.sh +++ b/terraform/deploy_ami_rotation_codebuild_image.sh @@ -9,7 +9,6 @@ source deploy_checkout_repos.sh cd ${CALCLOUD_BUILD_DIR}/iac/codebuild pwd -#./copy-cert # copy the cert from CI node AMI and replace the cert in current dir source hst_admin_role_shim.sh cert-update set -o pipefail && docker build -f Dockerfile -t ${AMIROTATION_DOCKER_IMAGE_UNSCANNED} --build-arg aws_env="${aws_env}" --build-arg CALCLOUD_VER="${CALCLOUD_VER}" . From a8b681ea5c4ef52e3d4ec5d1a3de07000e8330b2 Mon Sep 17 00:00:00 2001 From: Rob Swaters Date: Wed, 22 May 2024 18:35:07 +0000 Subject: [PATCH 3/7] Update AMI, deploy_vars.sh --- terraform/deploy_vars.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform/deploy_vars.sh b/terraform/deploy_vars.sh index 34004ed9..797a1468 100755 --- a/terraform/deploy_vars.sh +++ b/terraform/deploy_vars.sh @@ -1,6 +1,6 @@ #! /bin/bash -xu -export CALCLOUD_VER="v0.4.43" -export CALDP_VER="v0.2.25" +export CALCLOUD_VER="v0.4.44-rc1" +export CALDP_VER="v0.2.26-rc1" export CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_20240509_CAL_final" export BASE_IMAGE_TAG=`cut -d ":" -f2- <<< ${CAL_BASE_IMAGE} ` From 86ed7d0337eff5c93bec7f2d156121579731888e Mon Sep 17 00:00:00 2001 From: Rob Swaters Date: Tue, 16 Jul 2024 15:38:02 +0000 Subject: [PATCH 4/7] Base image and CRDS context updates --- changelog.md | 5 ++--- terraform/deploy_vars.sh | 6 +++--- terraform/variables.tf | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/changelog.md b/changelog.md index 00fae9aa..2e5934f3 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,2 @@ -- default base docker image set to CALDP_20240509_CAL_final -- default crds update to hst_1155.pmap -- SSL certificate workflow updates to pull certificates from the ITSD S3 bucket +- default base docker image set to CALDP_mostlyCOS_CAL_rc2 +- default crds update to hst_1168.pmap diff --git a/terraform/deploy_vars.sh b/terraform/deploy_vars.sh index 797a1468..33b9669a 100755 --- a/terraform/deploy_vars.sh +++ b/terraform/deploy_vars.sh @@ -1,7 +1,7 @@ #! /bin/bash -xu -export CALCLOUD_VER="v0.4.44-rc1" -export CALDP_VER="v0.2.26-rc1" -export CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_20240509_CAL_final" +export CALCLOUD_VER="v0.4.44-rc2" +export CALDP_VER="v0.2.26-rc2" +export CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_mostlyCOS_CAL_rc2" export BASE_IMAGE_TAG=`cut -d ":" -f2- <<< ${CAL_BASE_IMAGE} ` export COMMON_IMAGE_TAG="CALCLOUD_${CALCLOUD_VER}-CALDP_${CALDP_VER}-BASE_${BASE_IMAGE_TAG}" diff --git a/terraform/variables.tf b/terraform/variables.tf index a52d474a..f50395ed 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -117,10 +117,10 @@ variable crds_context { description = "the crds context to be the default for the environment" type = map(string) default = { - "-sb" = "hst_1101.pmap" - "-dev" = "hst_1101.pmap" - "-test" = "hst_1155.pmap" - "-ops" = "hst_1155.pmap" + "-sb" = "hst_1163.pmap" + "-dev" = "hst_1163.pmap" + "-test" = "hst_1168.pmap" + "-ops" = "hst_1168.pmap" } } From 3749701a0db4899249e5f85b223373836be1ffd3 Mon Sep 17 00:00:00 2001 From: Rob Swaters Date: Mon, 29 Jul 2024 19:30:01 +0000 Subject: [PATCH 5/7] Base image and CRDS context updates --- changelog.md | 4 ++-- terraform/deploy_vars.sh | 6 +++--- terraform/variables.tf | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/changelog.md b/changelog.md index 2e5934f3..761f74b6 100644 --- a/changelog.md +++ b/changelog.md @@ -1,2 +1,2 @@ -- default base docker image set to CALDP_mostlyCOS_CAL_rc2 -- default crds update to hst_1168.pmap +- default base docker image set to CALDP_mostlyCOS_CAL_rc4 +- default crds update to hst_1169.pmap diff --git a/terraform/deploy_vars.sh b/terraform/deploy_vars.sh index 33b9669a..9eb210e8 100755 --- a/terraform/deploy_vars.sh +++ b/terraform/deploy_vars.sh @@ -1,7 +1,7 @@ #! /bin/bash -xu -export CALCLOUD_VER="v0.4.44-rc2" -export CALDP_VER="v0.2.26-rc2" -export CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_mostlyCOS_CAL_rc2" +export CALCLOUD_VER="v0.4.44-rc4" +export CALDP_VER="v0.2.26-rc4" +export CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_mostlyCOS_CAL_rc4" export BASE_IMAGE_TAG=`cut -d ":" -f2- <<< ${CAL_BASE_IMAGE} ` export COMMON_IMAGE_TAG="CALCLOUD_${CALCLOUD_VER}-CALDP_${CALDP_VER}-BASE_${BASE_IMAGE_TAG}" diff --git a/terraform/variables.tf b/terraform/variables.tf index f50395ed..643735b2 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -117,10 +117,10 @@ variable crds_context { description = "the crds context to be the default for the environment" type = map(string) default = { - "-sb" = "hst_1163.pmap" - "-dev" = "hst_1163.pmap" - "-test" = "hst_1168.pmap" - "-ops" = "hst_1168.pmap" + "-sb" = "hst_1165.pmap" + "-dev" = "hst_1165.pmap" + "-test" = "hst_1169.pmap" + "-ops" = "hst_1169.pmap" } } From 0908fe63b7a418aa07f2e8908896a834c3e55963 Mon Sep 17 00:00:00 2001 From: Rob Swaters Date: Thu, 1 Aug 2024 20:03:59 +0000 Subject: [PATCH 6/7] Base image and CRDS context updates --- changelog.md | 2 +- terraform/deploy_vars.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/changelog.md b/changelog.md index 761f74b6..82d94d3a 100644 --- a/changelog.md +++ b/changelog.md @@ -1,2 +1,2 @@ -- default base docker image set to CALDP_mostlyCOS_CAL_rc4 +- default base docker image set to CALDP_mostlyCOS_CAL_rc5 - default crds update to hst_1169.pmap diff --git a/terraform/deploy_vars.sh b/terraform/deploy_vars.sh index 9eb210e8..8ce121a6 100755 --- a/terraform/deploy_vars.sh +++ b/terraform/deploy_vars.sh @@ -1,7 +1,7 @@ #! /bin/bash -xu -export CALCLOUD_VER="v0.4.44-rc4" -export CALDP_VER="v0.2.26-rc4" -export CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_mostlyCOS_CAL_rc4" +export CALCLOUD_VER="v0.4.44-rc5" +export CALDP_VER="v0.2.26-rc5" +export CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_mostlyCOS_CAL_rc5" export BASE_IMAGE_TAG=`cut -d ":" -f2- <<< ${CAL_BASE_IMAGE} ` export COMMON_IMAGE_TAG="CALCLOUD_${CALCLOUD_VER}-CALDP_${CALDP_VER}-BASE_${BASE_IMAGE_TAG}" From 340ce06dfc8818b6d8ebe11bc1bbc99db104719c Mon Sep 17 00:00:00 2001 From: Rob Swaters Date: Tue, 13 Aug 2024 18:57:43 +0000 Subject: [PATCH 7/7] Update base image and changelog.md --- changelog.md | 2 +- terraform/deploy_vars.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/changelog.md b/changelog.md index 82d94d3a..8ab2b1a2 100644 --- a/changelog.md +++ b/changelog.md @@ -1,2 +1,2 @@ -- default base docker image set to CALDP_mostlyCOS_CAL_rc5 +- default base docker image set to CALDP_20240813_CAL_final - default crds update to hst_1169.pmap diff --git a/terraform/deploy_vars.sh b/terraform/deploy_vars.sh index 8ce121a6..a858f454 100755 --- a/terraform/deploy_vars.sh +++ b/terraform/deploy_vars.sh @@ -1,7 +1,7 @@ #! /bin/bash -xu -export CALCLOUD_VER="v0.4.44-rc5" -export CALDP_VER="v0.2.26-rc5" -export CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_mostlyCOS_CAL_rc5" +export CALCLOUD_VER="v0.4.44" +export CALDP_VER="v0.2.26" +export CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_20240813_CAL_final" export BASE_IMAGE_TAG=`cut -d ":" -f2- <<< ${CAL_BASE_IMAGE} ` export COMMON_IMAGE_TAG="CALCLOUD_${CALCLOUD_VER}-CALDP_${CALDP_VER}-BASE_${BASE_IMAGE_TAG}"