[WIP] Defensive code in pull-sandbox-image.sh for custom AMI(s) #1648
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
dims
changed the title
ndbaker1
reviewed
Feb 9, 2024
Comment on lines
19
to
+21
| region=$(echo "${sandbox_image}" | cut -f4 -d ".") | ||
| ### skip if we don't find a region in the sandbox image | ||
| if [[ -z ${region:-} ]]; then |
There was a problem hiding this comment.
just because we parse a non-empty region doesn't mean its valid right?
registry.k8s.io/pause:3.9 is going to parse 9
There was a problem hiding this comment.
correct, we need more validation!
ndbaker1
reviewed
Feb 9, 2024
| @@ -29,7 +40,7 @@ function retry() { | |||
| done | |||
| } | |||
|
|
|||
| ecr_password=$(retry aws ecr get-login-password --region $region) | |||
| ecr_password=$(retry aws ecr get-login-password --region "${region}") | |||
There was a problem hiding this comment.
if we add carter's fix https://github.com/awslabs/amazon-eks-ami/pull/1646/files so that we don't break the whole workflow on this failing, the crictl calls should be fine even if the ecr_password is empty but we'd need to remove the explicit exit 1
tested empty
# crictl pull --creds "AWS:" registry.k8s.io/pause:3.9
Image is up to date for sha256:e6f1816883972d4be47bd48879a08919b96afcd344132622e4d444987919323c
|
@ndbaker1 @cartermckinnon feel free to folks this PR/commit into something you are already working on. opened this as WIP just to highlight |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
sandbox_imageis not even present (or commented out) in a custom config.toml (created by customer on top of our AMI as base or injected via user data)