diff --git a/changelog.md b/changelog.md index 00fae9a..8ab2b1a 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_20240813_CAL_final +- default crds update to hst_1169.pmap diff --git a/terraform/deploy.sh b/terraform/deploy.sh index 74cb4e6..8681784 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 3320ef1..66cbf47 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 3bc62ea..7685d63 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 diff --git a/terraform/deploy_ami_rotation_codebuild_image.sh b/terraform/deploy_ami_rotation_codebuild_image.sh index 38c37c8..5364b0e 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}" . diff --git a/terraform/deploy_vars.sh b/terraform/deploy_vars.sh index 34004ed..a858f45 100755 --- a/terraform/deploy_vars.sh +++ b/terraform/deploy_vars.sh @@ -1,7 +1,7 @@ #! /bin/bash -xu -export CALCLOUD_VER="v0.4.43" -export CALDP_VER="v0.2.25" -export CAL_BASE_IMAGE="stsci/hst-pipeline:CALDP_20240509_CAL_final" +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}" diff --git a/terraform/variables.tf b/terraform/variables.tf index a52d474..643735b 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_1165.pmap" + "-dev" = "hst_1165.pmap" + "-test" = "hst_1169.pmap" + "-ops" = "hst_1169.pmap" } }