Upgrade Garden to Containerd v2.0 #368
Open
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
We need to change this as containerd 2.0 no longer allows us to build binaries off of the vendor directory See containerd/containerd#11089
Containerd 2.0 changed the way it vendor's its scripts. We need to change our pathing for Containerd so we include the latest versions of the binaries to match our libraries.
MarcPaquette
force-pushed
the
WIP-containerd-2.0
branch
from
a836b4b to
e782a90
Compare
MarcPaquette
changed the title
|
Putting this to draft as I am waiting for runc to release this fix: opencontainers/runc#4555 |
| tcp_tls_ca = '' | ||
| tcp_tls_cert = '' | ||
| tcp_tls_key = '' | ||
| uid = 0 |
There was a problem hiding this comment.
Was this run as root before?
There was a problem hiding this comment.
These were always run as root as they are the default parameters. It runs this way with v1.
There was a problem hiding this comment.
I've removed these updates per our discussion and simplified the configuration.
| @@ -11,16 +11,18 @@ files: | |||
| - guardian/go.mod | |||
There was a problem hiding this comment.
I think runc-patches also needs to be removed
There was a problem hiding this comment.
I saw that.. Seemed slightly out of scope for the work.
There was a problem hiding this comment.
Runc patches are now removed.
Xenial is no longer supported so these workarounds are unneeded at this time.
winkingturtle-vmw
previously approved these changes
Jan 10, 2025
…eptance-tests grootfs guardian idmapper Submodule src/dontpanic 430458e1..f023b54f: > Update go.mod dependencies Submodule src/garden 76cb7fa7..8586d072: > Update go.mod dependencies Submodule src/garden-integration-tests c290c614..49a94f90: > Update go.mod dependencies Submodule src/garden-performance-acceptance-tests 17512cbb..ded303d2: > Update go.mod dependencies Submodule src/grootfs 414a8af5..95dd5f06: > Update go.mod dependencies Submodule src/guardian e6383bd9..024aa85e: > Update go.mod dependencies Submodule src/idmapper aa20b549..c77a6f0c: > Update go.mod dependencies
-------- index 1a688f9e..3ee68f8b 100644 @@ -5,7 +5,7 @@ go 1.22.0 toolchain go1.22.3 - github.com/onsi/ginkgo/v2 v2.22.0 + github.com/onsi/ginkgo/v2 v2.22.1 github.com/onsi/gomega v1.36.1
-------- index da52b66d..85a5d947 100644 @@ -7,7 +7,7 @@ toolchain go1.23.3 code.cloudfoundry.org/grootfs v0.30.0 github.com/BurntSushi/toml v1.4.0 - github.com/onsi/ginkgo/v2 v2.22.0 + github.com/onsi/ginkgo/v2 v2.22.1 github.com/onsi/gomega v1.36.1 gopkg.in/yaml.v2 v2.4.0
…eptance-tests grootfs guardian idmapper Submodule src/dontpanic f023b54f..f1eb5aa2: > Update go.mod dependencies Submodule src/garden 8586d072..d08842ac: > Update go.mod dependencies Submodule src/garden-integration-tests 49a94f90..d621db51: > Update go.mod dependencies Submodule src/garden-performance-acceptance-tests ded303d2..53497fe3: > Update go.mod dependencies Submodule src/grootfs 95dd5f06..b363a6bd: > Update go.mod dependencies Submodule src/guardian 024aa85e..5e82fc4c: > Update go.mod dependencies Submodule src/idmapper c77a6f0c..8fadc38d: > Update go.mod dependencies
-------- index 3ee68f8b..60f7e032 100644 @@ -6,7 +6,7 @@ toolchain go1.22.3 github.com/onsi/ginkgo/v2 v2.22.1 - github.com/onsi/gomega v1.36.1 + github.com/onsi/gomega v1.36.2
-------- index 85a5d947..0f7875eb 100644 code.cloudfoundry.org/grootfs v0.30.0 github.com/BurntSushi/toml v1.4.0 github.com/onsi/ginkgo/v2 v2.22.1 - github.com/onsi/gomega v1.36.1 + github.com/onsi/gomega v1.36.2 gopkg.in/yaml.v2 v2.4.0
…eptance-tests grootfs guardian idmapper Submodule src/dontpanic f1eb5aa2..1e408474: > Update go.mod dependencies Submodule src/garden d08842ac..bcee180f: > Update go.mod dependencies Submodule src/garden-integration-tests d621db51..32eb84c7: > Update go.mod dependencies Submodule src/garden-performance-acceptance-tests 53497fe3..fd57f988: > Update go.mod dependencies Submodule src/grootfs b363a6bd..8b497296: > Update go.mod dependencies Submodule src/guardian 5e82fc4c..888b829e: > Update go.mod dependencies Submodule src/idmapper 8fadc38d..6d54e640: > Update go.mod dependencies
-------- index 60f7e032..30a8000c 100644 @@ -5,7 +5,7 @@ go 1.22.0 toolchain go1.22.3 - github.com/onsi/ginkgo/v2 v2.22.1 + github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2
-------- index 0f7875eb..1c1e93fb 100644 @@ -7,7 +7,7 @@ toolchain go1.23.3 code.cloudfoundry.org/grootfs v0.30.0 github.com/BurntSushi/toml v1.4.0 - github.com/onsi/ginkgo/v2 v2.22.1 + github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2 gopkg.in/yaml.v2 v2.4.0
…eptance-tests grootfs guardian idmapper Submodule src/dontpanic 1e408474..95acfd75: > Update go.mod dependencies Submodule src/garden bcee180f..4d85c9b0: > Update go.mod dependencies Submodule src/garden-integration-tests 32eb84c7..2a0cd08d: > Update go.mod dependencies Submodule src/garden-performance-acceptance-tests fd57f988..92120def: > Update go.mod dependencies Submodule src/grootfs 8b497296..6e446846: > Update go.mod dependencies Submodule src/guardian 888b829e..44c698f0: > Update go.mod dependencies Submodule src/idmapper 6d54e640..eb5c1eb1: > Update go.mod dependencies
-------- index 30a8000c..3e7c409b 100644
-------- index 1c1e93fb..202bbfac 100644
…otfs guardian Submodule src/garden-integration-tests 2a0cd08d..e7db6108: > Update go.mod dependencies Submodule src/garden-performance-acceptance-tests 92120def..fa37ae3a: > Update go.mod dependencies Submodule src/grootfs 6e446846..9ea50045: > Update go.mod dependencies Submodule src/guardian 44c698f0..37122278: > Update go.mod dependencies > Merge pull request #465 from cloudfoundry/cgroups-v2
Submodule src/garden-integration-tests e7db6108..0c2eb2e8: > Update go.mod dependencies > Pin filepath-securejoin Submodule src/grootfs 9ea50045..2b1c1ad1: > Update go.mod dependencies Submodule src/guardian 37122278..7b178cab: > Update go.mod dependencies > Fix constant name > Move runc cgroups function to linux only files > Update go.mod dependencies > Pin filepath-securejoin > Fix staticcheck errors
Submodule src/garden-integration-tests 0c2eb2e8..58a212aa: > Update go.mod dependencies Submodule src/guardian 7b178cab..1aaf9d0b: > Update go.mod dependencies > Vendor gardencgroups once > Re-vendor packages > Replace deprecated github.com/docker/docker/pkg/reexec
Submodule src/garden-integration-tests 58a212aa..0f303384: > Update go.mod dependencies Submodule src/grootfs 2b1c1ad1..16821bca: > Update go.mod dependencies
…sts grootfs guardian Submodule src/garden 4d85c9b0..0e958c0c: > Update go.mod dependencies Submodule src/garden-integration-tests 0f303384..46912e12: > Update go.mod dependencies Submodule src/garden-performance-acceptance-tests fa37ae3a..fca150bf: > Update go.mod dependencies Submodule src/grootfs 16821bca..c3784760: > Update go.mod dependencies Submodule src/guardian 1aaf9d0b..3520f055: > Update go.mod dependencies > Add 10:200 to list of allowed devices
--------
…rdian Submodule src/garden-integration-tests 46912e12..d4b92680: > Update go.mod dependencies Submodule src/garden-performance-acceptance-tests fca150bf..68fb6809: > Update go.mod dependencies Submodule src/guardian 3520f055..1165bf1e: > Update go.mod dependencies > Revert to using tmp directory for cgroups v1 in cpu cgroups tests
|
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.
Upgrading Containerd to Version 2.0. This requires a new way of building the containerd binaries as the vendoring of the repository no longer includes makefiles.
Please see other PR's as they are all interdependent:
cloudfoundry/guardian#466
cloudfoundry/wg-app-platform-runtime-ci#61