Use commit-sha instead of tag for containerd #35770
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
|
IMO the tag is superior, and this would be a good case for fixing the version comparison code, but I could be convinced. 😇 |
|
Yes the tag is certainly more readable (although mutable). The reason I chose this solution for now, is that fixing the version-comparison is only half the problem; the CLI would need an update as well, in which case it won't be resolved for older versions (was thinking of comparing by SHA, but printing a user-friendly version). We need to have a look at it in a wider context though; as I mentioned, with containerd reaching 1.0, there may no longer be a need to do this strict comparison. FWIW, |
thaJeztah
force-pushed
the
use-commit-instead-of-version
branch
from
1103958
to
0d1d55a
Compare
thaJeztah
added
status/2-code-review
rebuild/experimental
and removed
status/0-triage
labels
|
I guess #35765 will fix the vendor suite |
thaJeztah
force-pushed
the
use-commit-instead-of-version
branch
from
0d1d55a
to
9ca1b5e
Compare
|
hmf |
The `docker info` command compares the installed version
of containerd using a Git-sha. We currently use a tag for
this, but that tag is not returned by the version-API of
containerd, resulting in the `docker info` output to show:
containerd version: 89623f28b87a6004d4b785663257362d1658a729 (expected: v1.0.0)
This patch changes the `v1.0.0` tag to the commit that
corresponds with the tag, so that the `docker info` output
does not show the `expected:` string.
This should be considered a temporary workaround; the check
for the exact version of containerd that's installed was needed
when we still used the 0.2.x branch, because it did not have
stable releases yet.
With containerd reaching 1.0, and using SemVer, we can likely
do a comparison for "Major" version, or make this a "packaging"
issue, and remove the check entirely (we can still _print_ the
version that's installed if we think it's usefule).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
use-commit-instead-of-version
branch
from
9ca1b5e
to
2c8018f
Compare
|
All tests passed. Merging.. |
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.
The
docker infocommand compares the installed versionof containerd using a Git-sha. We currently use a tag for
this, but that tag is not returned by the version-API of
containerd, resulting in the
docker infooutput to show:This patch changes the
v1.0.0tag to the commit thatcorresponds with the tag, so that the
docker infooutputdoes not show the
expected:string.This should be considered a temporary workaround; the check
for the exact version of containerd that's installed was needed
when we still used the 0.2.x branch, because it did not have
stable releases yet.
With containerd reaching 1.0, and using SemVer, we can likely
do a comparison for "Major" version, or make this a "packaging"
issue, and remove the check entirely (we can still print the
version that's installed if we think it's usefule).
I can add a test for this
- How to verify it
run
docker infoand check that theexpected:string is not present- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)