V1.5.5 snap ids (FIXME) - #1
Open
ustiugov wants to merge 71 commits into
Open
Conversation
Signed-off-by: Mike Brown <brownwm@us.ibm.com> (cherry picked from commit c74a6c4) Signed-off-by: Mike Brown <brownwm@us.ibm.com>
…ct-critools-release [release/1.5] update to new cri-tools make install
This is required for environments/build systems where a specific go version / command needs to be used. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> (cherry picked from commit 9ea2563) Signed-off-by: Derek McGowan <derek@mcg.dev>
fix [#45710](golang/go#45710) and CVE-2021-31525. Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com> (cherry picked from commit 79d800b) Signed-off-by: Derek McGowan <derek@mcg.dev>
…d-updates [release/1.5] Backport build updates
Signed-off-by: Davanum Srinivas <davanum@gmail.com> (cherry picked from commit 5c99f15) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
[release/1.5 backport] Update the runc binary used with containerd to runc v1.0.0-rc94
Signed-off-by: Lantao Liu <lantaol@google.com> (cherry picked from commit 81402e4) Signed-off-by: Lantao Liu <lantaol@google.com>
…elease-1.5 [release/1.5] Backport containerd#5446 to release 1.5.
Signed-off-by: Mike Brown <brownwm@us.ibm.com> (cherry picked from commit b59e297) Signed-off-by: Derek McGowan <derek@mcg.dev>
Signed-off-by: Mike Brown <brownwm@us.ibm.com> (cherry picked from commit 6e249b1) Signed-off-by: Derek McGowan <derek@mcg.dev>
…cumentation [release/1.5] hosts documentation
The latest tag is no longer available for alpine, pin to the latest version rather than using latest Signed-off-by: Derek McGowan <derek@mcg.dev> (cherry picked from commit 2fbc1c4) Signed-off-by: Derek McGowan <derek@mcg.dev>
…tion-pin-image [release/1.5] integration pin image
Signed-off-by: Mike Brown <brownwm@us.ibm.com> (cherry picked from commit 3157392) Signed-off-by: Derek McGowan <derek@mcg.dev>
…nary-release-update [release/1.5] Update imgcrypt release
Signed-off-by: Derek McGowan <derek@mcg.dev>
Prepare release notes for v1.5.1
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 599127f) Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
[release/1.5] update runc binary to v1.0.0-rc95
Signed-off-by: Derek McGowan <derek@mcg.dev>
[release/1.5] Prepare release notes for v1.5.2
This change splits the definition of pkg/cri/os.ResolveSymbolicLink by platform (windows/!windows), and switches to an alternate implementation for Windows. This aims to fix the issue described in containerd#5405. The previous implementation which just called filepath.EvalSymlinks has historically had issues on Windows. One of these issues we were able to fix in Go, but EvalSymlinks's behavior is not well specified on Windows, and there could easily be more issues in the future, so it seems prudent to move to a separate implementation for Windows. The new implementation uses the Windows GetFinalPathNameByHandle API, which takes a handle to an open file or directory and some flags, and returns the "real" name for the object. See comments in the code for details on the implementation. I have tested this change with a variety of mounts and everything seems to work as expected. Functions that make incorrect assumptions on what a Windows path can look like may have some trouble with the \\?\ path syntax. For instance EvalSymlinks fails when given a \\?\UNC\ path. For this reason, the resolvePath implementation modifies the returned path to translate to the more common form (\\?\UNC\server\share -> \\server\share). Signed-off-by: Kevin Parsons <kevpar@microsoft.com> (cherry picked from commit b0d3b35) Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
[release/1.5] cherry-pick: windows: Use GetFinalPathNameByHandle for ResolveSymbolicLink
Signed-off-by: Phil Estes <estesp@amazon.com> (cherry picked from commit edfd8d5)
[release/1.5] cherry-pick: Change Wrapf of non-error to an actual error
Signed-off-by: Mike Brown <brownwm@us.ibm.com> (cherry picked from commit 014748b)
…ease-1.5 [release/1.5] cherry pick containerd#5565 to release 1.5 - fix invalid validation error checking
Due to a change in Go, the go.mod file cannot declare a version of Go above the installed `go version`; until the default Go version in GitHub actions virt environments is 1.16, we have to install 1.16 before running the project checks now. Signed-off-by: Phil Estes <estesp@amazon.com> (cherry picked from commit 3ab9744)
[release/1.5] cherry-pick: Add proper Go version before project checks
Discovered this while using HTTP tracing via OpenTelemetry inside of buildkitd, where the trace spans were not being reported for the registry PUT http requests. The spans are only reported on the Close for the Body, after adding these Close calls, the spans are reported as expected. Signed-off-by: coryb <cbennett@netflix.com> (cherry picked from commit 894b6ae) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
0.8.18 contains a fix for shim delete behavior, please see: microsoft/hcsshim#1041 This time it brings in quite a few new files as 1.5 was on 0.8.16 of hcsshim and 0.8.17 brought in a few new things. 0.8.18 doesn't actually bring in any new vendored files but the version of the runhcs-shim built is based off of the commit that's vendored into Containerd, so we need to vendor the version that has the fix. Signed-off-by: Daniel Canter <dcanter@microsoft.com> (cherry picked from commit a81f05f) Signed-off-by: Daniel Canter <dcanter@microsoft.com>
…_push_close_body [release/1.5 backport] Fix missing Body.Close() calls on push to docker remote
[release/1.5 backport] Update hcsshim to 0.8.18
Release notes: https://golang.org/doc/devel/release#go1.16 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit e72046f) Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
[release/1.5] Update Go to 1.16.6
Signed-off-by: Derek McGowan <derek@mcg.dev>
Signed-off-by: Derek McGowan <derek@mcg.dev>
[release/1.5] prepare release notes for 1.5.3
Signed-off-by: Sebastian Hasler <sebastian.hasler@gmx.net> (cherry picked from commit c0e2f4b) Signed-off-by: Wei Fu <fuweid89@gmail.com>
[release/1.5] Use chmod path for checking symlink
Signed-off-by: Derek McGowan <derek@mcg.dev>
[release/1.5] Prepare release notes for v1.5.4
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 43e0594) Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
[release/1.5] update runc to v1.0.1
[release/1.5] Try next mirror in case of non-404 errors, too
- View was somehow logging itself as "prepare" - Cleanup should have its debug log as like other exported methods Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com> (cherry picked from commit 03ee450) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Allows redirects to be authorized if authorization is provided for the redirected to host. The authorization will always go to the redirect and never to the referrer. Signed-off-by: Derek McGowan <derek@mcg.dev> (cherry picked from commit b1d4140) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
…thorization_on_redirect [release/1.5 backport] Update docker resolver to authorize redirects
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com> (cherry picked from commit 67d07fe) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com> (cherry picked from commit 53ec1ab) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
…ssing_body_close [release/1.5 backport] add missing body.Close() in docker/fetcher and docker/pusher
[release/1.5 backport] snapshot/devmapper: log exported methods correctly
Signed-off-by: Derek McGowan <derek@mcg.dev>
[release/1.5] Prepare release notes for v1.5.5
Signed-off-by: Amory Hoste <amory.hoste@gmail.com>
ustiugov
commented
May 20, 2022
| string name = 1; | ||
| string parent = 2; | ||
| Kind kind = 3; | ||
| string snapshot_id = 4; |
Member
Author
There was a problem hiding this comment.
please have the added fields at the end of the proto so that we have fewer compatibility issues
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
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.
@amohoste please brush up this PR so we can keep track this dependency for vHive.