bug: support container image SHA256 version #1248
Merged
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
Pull Request Test Coverage Report for Build 12883639910Details
💛 - Coveralls |
rollandf
force-pushed
the
version-validation
branch
2 times, most recently
from
bd84c13 to
a981903
Compare
e0ne
reviewed
Jan 15, 2025
| @@ -103,6 +103,14 @@ func nindentPrefix(spaces int, prefix, v string) string { | |||
| return strings.Replace(nindent(spaces, prefix+v), " ", "", len(prefix)) | |||
| } | |||
|
|
|||
| // imagePath returns contaimer image path, supporting sha256 format | |||
| func imagePath(repository, image, version string) string { | |||
There was a problem hiding this comment.
Why do we need it as a template function instead of generating it in the code and pass the value into template? IMO, it makes templates more complicated without additional benefits
There was a problem hiding this comment.
My thoughts that this way will require less changes.
In code, we will need for each state:
- add a new field 'imagePath' to the
ManifestRenderData - generate the value and add it in the
ManifestRenderData - update the manifests to use the new 'imagePath'
I am OK to do the change if you prefer that way
There was a problem hiding this comment.
Sounds good to me to keep it as proposed now
e0ne
previously approved these changes
Jan 15, 2025
| @@ -103,6 +103,14 @@ func nindentPrefix(spaces int, prefix, v string) string { | |||
| return strings.Replace(nindent(spaces, prefix+v), " ", "", len(prefix)) | |||
| } | |||
|
|
|||
| // imagePath returns contaimer image path, supporting sha256 format | |||
| func imagePath(repository, image, version string) string { | |||
There was a problem hiding this comment.
Sounds good to me to keep it as proposed now
almaslennikov
previously approved these changes
Jan 15, 2025
adrianchiris
previously approved these changes
Jan 21, 2025
pkg/render/render.go
Outdated
| @@ -103,6 +103,14 @@ func nindentPrefix(spaces int, prefix, v string) string { | |||
| return strings.Replace(nindent(spaces, prefix+v), " ", "", len(prefix)) | |||
| } | |||
|
|
|||
| // imagePath returns contaimer image path, supporting sha256 format | |||
There was a problem hiding this comment.
nit: contaimer -> container :)
In OCP disconnected environment, the mirrored images are not using tags but SHA256. This change support boths format in the NCP except for DOCA-Driver. Signed-off-by: Fred Rolland <[email protected]>
rollandf
dismissed stale reviews from adrianchiris, almaslennikov, and e0ne
via
c12c6a7
rollandf
force-pushed
the
version-validation
branch
from
a981903 to
c12c6a7
Compare
adrianchiris
approved these changes
Jan 21, 2025
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.
In OCP disconnected environment, the mirrored images are not using tags but SHA256.
This change support boths format in the NCP except for DOCA-Driver.