Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleans up helm chart building and pushing #2702

Merged
merged 1 commit into from
Dec 14, 2023
Merged

cleans up helm chart building and pushing #2702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/lib/buildkit.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ else
log_file=$(mktemp)
trap "rm -f $log_file" EXIT
if ! $CMD $ARGS 2>&1 | tee $log_file; then
if grep -q "blobs/uploads/\": EOF" $log_file ; then
if grep -q "blobs/uploads/\": EOF" $log_file || grep -q "blobs/uploads.*404 Not Found" $log_file; then
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think the error changed slightly on ecr-public, so just added this in.

echo "******************************************************"
echo "Ensure container registry and repository exists!!"
echo "Try running make create-ecr-repos to create ecr repositories in your aws account."
Expand Down
8 changes: 2 additions & 6 deletions build/lib/helm_push.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export HELM_REGISTRY_CONFIG="${DOCKER_CONFIG}/config.json"
export HELM_EXPERIMENTAL_OCI=1
TMPFILE=$(mktemp /tmp/helm-output.XXXXXX)
function cleanup() {
if grep -q "blobs/uploads/\": EOF" $TMPFILE ; then
if grep -q "blobs/uploads/\": EOF" $TMPFILE || grep -q "blobs/uploads.*404 Not Found" $TMPFILE; then
echo "******************************************************"
echo "Ensure container registry and repository exists!!"
echo "Try running make create-ecr-repos to create ecr repositories in your aws account."
Expand All @@ -69,11 +69,7 @@ helm push ${CHART_FILE} oci://${IMAGE_REGISTRY}/${HELM_DESTINATION_OWNER} 2>&1 |
DIGEST=$(grep Digest $TMPFILE | $SED -e 's/Digest: //')

# Adds a 2nd tag to the helm chart for the bundle-release jobs.
if [[ "${IMAGE_REGISTRY}" != *"public.ecr.aws"* ]] && [[ "${IMAGE_REGISTRY}" == *"ecr"* ]]; then
MANIFEST=$(build::common::echo_and_run aws ecr batch-get-image --repository-name "$HELM_DESTINATION_REPOSITORY" --image-ids imageDigest=${DIGEST} --query "images[].imageManifest" --output text)
export AWS_PAGER=""
build::common::echo_and_run aws ecr put-image --repository-name ${HELM_DESTINATION_REPOSITORY} --image-tag ${SEMVER_GIT_TAG}-${LATEST_TAG}-helm --image-manifest "$MANIFEST" --image-manifest-media-type "application/vnd.oci.image.manifest.v1+json"
fi
build::common::echo_and_run skopeo copy docker://${IMAGE_REGISTRY}/${HELM_DESTINATION_REPOSITORY}@${DIGEST} docker://${IMAGE_REGISTRY}/${HELM_DESTINATION_REPOSITORY}:${SEMVER_GIT_TAG}-${LATEST_TAG}-helm

{
set +x
Expand Down
102 changes: 44 additions & 58 deletions build/lib/helm_require.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ DEST_DIR=${OUTPUT_DIR}/helm/${CHART_NAME}
SCRIPT_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
source "${SCRIPT_ROOT}/common.sh"

if [ "${HELM_USE_UPSTREAM_IMAGE}" != true ] && [[ "${IMAGE_REGISTRY}" == *"ecr"* ]] && ! aws sts get-caller-identity &> /dev/null; then
echo "The AWS cli is used to find the ECR registries and repos for the current AWS account please login!"
exit 1;
fi

#
# Image tags
#
Expand All @@ -56,11 +51,6 @@ spec:
JSON_SCHEMA_FILE=$PROJECT_ROOT/helm/schema.json
SEDFILE=${OUTPUT_DIR}/helm/sedfile

export HELM_REGISTRY="$IMAGE_REGISTRY"
if [ "${HELM_USE_UPSTREAM_IMAGE}" != true ] && [[ "${IMAGE_REGISTRY}" == *"ecr"* ]]; then
export HELM_REGISTRY=$(aws ecr-public describe-registries --region us-east-1 --output text --query 'registries[*].registryUri' 2> /dev/null)
fi

export IMAGE_TAG
export HELM_TAG
envsubst <$PROJECT_ROOT/helm/sedfile.template >${SEDFILE}
Expand All @@ -73,70 +63,66 @@ function get_image_shasum() {
local -r tag=$2

local image_shasum=
if [ "${HELM_USE_UPSTREAM_IMAGE}" = true ]; then
image_shasum=$(build::common::echo_and_run ${SCRIPT_ROOT}/image_shasum.sh ${IMAGE_REGISTRY} ${image} ${tag})
elif [ "${JOB_TYPE:-}" = "presubmit" ] || [[ "${IMAGE_REGISTRY}" != *"ecr"* ]]; then
image_shasum=${LATEST}
fi

if [[ -z ${image_shasum} ]] && aws --region us-east-1 ecr-public describe-repositories --repository-names ${image} &> /dev/null; then
image_shasum=$(build::common::echo_and_run ${SCRIPT_ROOT}/image_shasum.sh ${HELM_REGISTRY} ${image} ${tag})
if [ "${JOB_TYPE:-}" = "presubmit" ]; then
echo ${LATEST}
elif [[ -z ${image_shasum} ]]; then
build::common::echo_and_run ${SCRIPT_ROOT}/image_shasum.sh ${IMAGE_REGISTRY} ${image} ${tag}
fi

if [[ -z ${image_shasum} ]] && aws ecr describe-repositories --repository-names ${image} &> /dev/null; then
image_shasum=$(build::common::echo_and_run ${SCRIPT_ROOT}/image_shasum.sh ${IMAGE_REGISTRY} ${image} ${tag})
fi

if [[ -n ${image_shasum} ]]; then
echo ${image_shasum}
else
echo "${image} does not exist in ECR Public or Private"
exit 1
fi
}

# query ecr for the image by latest tag and find the first non-latest tag the image is also tagged with
function get_image_tag_not_latest() {
local -r image=$1
local -r tag=$2
local -r shasum=$2

local use_tag=
# to find another tag associated with this image we have to use the aws cli
# the following only works for ecr repos
if [ "${JOB_TYPE:-}" = "presubmit" ] || [[ "${IMAGE_REGISTRY}" != *"ecr"* ]]; then
use_tag=${tag}
fi

if [[ -z ${use_tag} ]] && aws --region us-east-1 ecr-public describe-repositories --repository-names ${image} &> /dev/null; then
use_tag=$(build::common::echo_and_run aws --region us-east-1 ecr-public describe-images --repository-name ${image} --image-ids imageTag=${tag} --query 'imageDetails[0].imageTags' --output yaml 2> /dev/null | grep -v ${tag} | head -1| sed -e 's/- //')
fi

if [[ -z ${use_tag} ]] && aws ecr describe-repositories --repository-names ${image} &> /dev/null; then
use_tag=$(build::common::echo_and_run aws ecr describe-images --repository-name ${image} --image-id imageTag=${tag} --query 'imageDetails[0].imageTags' --output yaml 2> /dev/null | grep -v ${tag} | head -1| sed -e 's/- //')
fi

if [[ -n ${use_tag} ]]; then
echo ${use_tag}
echo ${tag}
else
echo "${image}@${tag} does not exist in ECR Public or Private"
exit 1
fi
if ! aws sts get-caller-identity &> /dev/null; then
echo "The AWS cli is used to find the ECR registries and repos for the current AWS account please login!"
exit 1;
fi

local service="ecr"
if [[ "${IMAGE_REGISTRY}" = *"public.ecr"* ]]; then
service="--region us-east-1 ecr-public"
fi
build::common::echo_and_run aws ${service} describe-images --repository-name ${image} --image-id imageDigest=${shasum} --query 'imageDetails[0].imageTags' --output yaml | grep -v ${LATEST} | head -1| sed -e 's/- //'
fi
}

for IMAGE in ${HELM_IMAGE_LIST:-}; do
# if its the image(s) built from this project, use the image_tag
# otherwise its an image from a different project so use latest to trigger finding the latest image
if [ "${IMAGE}" = "${HELM_DESTINATION_REPOSITORY}" ] || [ "${IMAGE_TAG}" != "${HELM_TAG}" ]; then
TAG="${IMAGE_TAG}"
else
TAG="${LATEST}"
# the image_list will include images built by the current project and potentially images built from
# other projects, ex: prometheus chart includes the node_exporter which is built seperately
# since each project is built independently and is tagged with the current HEAD commit hash
# images built via this current build may not be tagged exactly the same as images from other builds
# this code will first try to pull the image by the IMAGE_TAG and if that is not available
# it will fallback to the LATEST tag which follows the same pattern we use for artifacts on s3
# in the event that the LATEST tag is used, the ecr api will be used to get a different tag, which
# should be the tag in the format <version>-<commit-hash>, this tag will be used in the requires.yaml
IMAGE_SHASUM=$(get_image_shasum ${IMAGE} ${IMAGE_TAG})

if [[ -z ${IMAGE_SHASUM} ]]; then
IMAGE_SHASUM=$(get_image_shasum ${IMAGE} ${LATEST})
fi

IMAGE_SHASUM=$(get_image_shasum ${IMAGE} ${TAG})

if [[ -z ${IMAGE_SHASUM} ]]; then
echo "Neither ${IMAGE}@${IMAGE_TAG} nor ${IMAGE}@${LATEST} exists!"
exit 1
fi

echo "s,{{${IMAGE}}},${IMAGE_SHASUM},g" >>${SEDFILE}
if [ "${TAG}" = "${LATEST}" ]; then
USE_TAG=$(get_image_tag_not_latest ${IMAGE} ${LATEST})
if [ "${IMAGE_TAG}" = "${LATEST}" ]; then
# if finding an image from another project using the `latest` tag, find the image and a different tag associated with that image
USE_TAG=$(get_image_tag_not_latest ${IMAGE} ${IMAGE_SHASUM})
if [[ -z ${USE_TAG} ]]; then
echo "non-${LATEST} tag does not exist for ${IMAGE}@${IMAGE_SHASUM}!"
exit 1
fi
else
USE_TAG=$TAG
USE_TAG=$IMAGE_TAG
fi

# If HELM_USE_UPSTREAM_IMAGE is true, we are using images from upstream.
Expand Down
7 changes: 2 additions & 5 deletions build/lib/image_shasum.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,8 @@ TMPFILE=$(mktemp)
trap "rm -f $TMPFILE" exit
TARGET=${REGISTRY}/${REPOSITORY}:${IMAGE_TAG}

>&2 echo -n "Checking for the existence of ${TARGET}..."
if skopeo inspect -n --raw docker://${TARGET} >${TMPFILE} 2>/dev/null; then
>&2 echo "Found!"
if build::common::echo_and_run skopeo inspect -n --raw docker://${TARGET} >${TMPFILE}; then
>&2 echo "Found: $(skopeo manifest-digest ${TMPFILE})"
skopeo manifest-digest ${TMPFILE}
else
>&2 echo "Not Found!"
fi