Use ECR feed for OCI and docker #1415
Draft
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
eddymoulton
commented
Dec 17, 2024
Comment on lines
+30
to
+39
| var isHelmChart = | ||
| jsonManifest.HasConfigMediaTypeContaining(OciConstants.Manifest.Config.OciImageMediaTypeValue) | ||
| || jsonManifest.HasLayersMediaTypeContaining(OciConstants.Manifest.Layers.HelmChartMediaTypeValue); | ||
|
|
||
| if (isHelmChart) | ||
| return OciArtifactTypes.HelmChart; | ||
|
|
||
| var isDockerImage = jsonManifest.HasMediaTypeContaining(OciConstants.Manifest.DockerImageMediaTypeValue) | ||
| || jsonManifest.HasConfigMediaTypeContaining(OciConstants.Manifest.Config.DockerImageMediaTypeValue) | ||
| || jsonManifest.HasLayersMediaTypeContaining(OciConstants.Manifest.Layers.DockerImageMediaTypeValue); |
There was a problem hiding this comment.
Note for myself before merging, I need to confirm these are all correct and expected.
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.
ECR supports more than just container (docker) images as it's a fully featured OCI registry.
To allow support for this we can query the manifest before we download/pull the image to switch between our pre-existing support for OCI feeds and docker feeds.
This approach means that users must have some pre-existing knowledge about the package when selecting from an ECR feed as it could be a helm chart, container image or any other OCI artifact type.
It is worth nothing that currently we do nothing to filter out non-docker images from the search and any helm charts in ECR would appear as options when deploying a container - but would simply fail to deploy.
I was going to put this behind a feature toggle, but when we try to run the acquire packages step we don't pass any of those variables down to Calamari and it runs with the feature toggle off - which grabs the docker package instead.
This is fully crashing on my machine, but I think for unrelated reasons. I am going to test the same on a branch instance to find out more.
[[sc-75291]]