refactor package and variant dependencies #1549
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
tjkirch
approved these changes
Apr 30, 2021
jpculp
approved these changes
Apr 30, 2021
webern
reviewed
May 1, 2021
|
The force-push above adds back the |
This is not required since containerd 1.4. Seccomp support is always enabled, and no longer depends on libseccomp via cgo. Signed-off-by: Ben Cressey <bcressey@amazon.com>
We always install systemd by way of the "release" package, so we only need to add a dependency if it's a build requirement. Signed-off-by: Ben Cressey <bcressey@amazon.com>
These plugins are only needed for Kubernetes and CRI. Signed-off-by: Ben Cressey <bcressey@amazon.com>
Conceptually, `host-ctr` is another tool we expect to be present in the OS, like `systemctl`. Practically, this lets us start the `os` build sooner, which is nice because it's one of the longest. Signed-off-by: Ben Cressey <bcressey@amazon.com>
All of the packages that depend on containerd need it at runtime, and not at build time. To streamline the overall build, treat containerd as an implicit dependency, like systemd or glibc. Signed-off-by: Ben Cressey <bcressey@amazon.com>
All of the packages that depend on iptables need it at runtime, and not at build time. To streamline the overall build, treat iptables as an implicit dependency, like systemd or glibc. Signed-off-by: Ben Cressey <bcressey@amazon.com>
The `find` command is useful enough to be included in all variants. Remove the explicit dependency from Kubernetes packages for greater build parallelism. Signed-off-by: Ben Cressey <bcressey@amazon.com>
The `ps` command is useful enough to be included in all variants. Remove the explicit dependency from docker-engine for greater build parallelism. Signed-off-by: Ben Cressey <bcressey@amazon.com>
The `conntrack` command can be useful in debugging networking issues with both Docker and Kubernetes. Remove the explicit dependency from Kubernetes packages for greater build parallelism. Signed-off-by: Ben Cressey <bcressey@amazon.com>
The docker-engine package is listed in the variant definition, and we don't need it as a build-time requirement. Signed-off-by: Ben Cressey <bcressey@amazon.com>
|
The force-push above fixes the conflicts by rebasing, and is probably less useful than just looking at the full diff again. |
webern
approved these changes
May 17, 2021
tjkirch
approved these changes
May 18, 2021
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.
Issue number:
N/A
Description of changes:
This shifts some commonly used packages into the set installed by "release".
find,ps, andconntrackwill now be available on all variants, instead of some onaws-k8s-*and others onaws-ecs-1."host-ctr" and "containerd" are also promoted to the "release" package set. They end up installed regardless because of our host containers feature, and moving the dependency allows us to start building the "os" package sooner.
Most of the dependencies of Go packages have been eliminated, since those aren't needed at build time. The notable exception is the "runc" dependency on "libseccomp".
Testing done:
Built all variants locally.
Confirmed that
aws-k8s-1.18andaws-ecs-1worked as expected:find,ps, andconntrackwere presentTerms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.