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.

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

Conversation

jaxesn
Copy link
Member

@jaxesn jaxesn commented Dec 1, 2023

Issue #, if available:

Description of changes:

This is a further attempt at cleaning up the helm building process. This removes (almost) all the ecr/public specific logic in favor of using skopeo where possible to support any registry, including local ones.

This simplifies the logic when looking for images down:

  • for the actual images associated with whatever project is building, it tries to find and pull them from whatever image_regi is configured. It no longer is checking other regi, like ecr-public.
  • for images that come from other projects, it also pulls them from the current regi, but it has to use the latest tag to try and find it vs the specific tag, since those images would have been built previous and have different specific tags.
  • for images found via latest, it will use the aws cli to find another tag associated with that image to be used in the helm chart. i honestly dont know the significance here, but this is how its always been so there must be a decent reason

When pushing the final chart, it used to use the aws cli to add a second tag to the helm chart in ecr, this is changed to use skopeo copy instead to be more generic.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot eks-distro-bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 1, 2023
@@ -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.

@jaxesn jaxesn closed this Dec 1, 2023
@jaxesn jaxesn force-pushed the jgw/cleanup-helm-more branch from e8372b1 to 5bee9f9 Compare December 1, 2023 20:04
@eks-distro-bot eks-distro-bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Dec 1, 2023
@jaxesn jaxesn reopened this Dec 1, 2023
@eks-distro-bot eks-distro-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Dec 1, 2023
@d8660091
Copy link
Member

d8660091 commented Dec 5, 2023

/LGTM

@jaxesn
Copy link
Member Author

jaxesn commented Dec 14, 2023

/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jaxesn

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@eks-distro-bot eks-distro-bot merged commit a101186 into aws:main Dec 14, 2023
89 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants