disable digest resolution for manifest v2 schema 1 manifests #4249
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
Yiyuanzzz
changed the title
Yiyuanzzz
changed the title
amogh09
reviewed
Jul 19, 2024
agent/engine/docker_task_engine.go
Outdated
| field.ImageMediatype: imageManifestMediatype, | ||
| field.Image: container.Image, | ||
| }) | ||
| if strings.Contains(imageManifestMediatype, "application/vnd.docker.distribution.manifest.v1") { |
There was a problem hiding this comment.
Let's create constants for the two possible media type values for Schema 1 and use the constants here.
Kinda like this
https://github.com/distribution/distribution/blob/release/2.8/manifest/schema1/manifest.go#L14-L18
amogh09
reviewed
Jul 19, 2024
agent/engine/docker_task_engine.go
Outdated
| field.ImageMediaType: imageManifestMediaType, | ||
| field.Image: container.Image, | ||
| }) | ||
| if strings.Contains(imageManifestMediaType, mediaTypeManifestV1) || strings.Contains(imageManifestMediaType, mediaTypeSignedManifestV1) { |
There was a problem hiding this comment.
Why do we want to do strings.Contains instead of just ==?
amogh09
approved these changes
Jul 22, 2024
tinnywang
approved these changes
Jul 23, 2024
Merged
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.
Summary
ECS Agent will disable the digest resolution for Schema 1 manifest as a workaround for a bug in ECR that ECR will reports an incorrect digest during digest resolution phase for Schema V1 manifests which then causes image pull using the digest to fail.
Implementation details
skip digest resolution for manifest v2 schema 1 manifests
Testing
Reproduce the issue by setting Up Pull-Through Cache Rule
Manually ran a task with schema 1 image 130669029530.dkr.ecr.us-west-2.amazonaws.com/quay/coreos/etcd:v2.0.4, we can see error " image verification failed for digest "
Manually ran a task with schema 1 image 130669029530.dkr.ecr.us-west-2.amazonaws.com/quay/coreos/etcd:v2.0.4 with test agent(changes of this pr), we can see digest resolution is skipped and pulling image complete.
New tests cover the changes:
Description for the changelog
Bugfix: Disable Digest Resolution for Manifest V2 Schema 1
Does this PR include breaking model changes? If so, Have you added transformation functions?
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.